Make sure that we take the existng temporary contact, where available.
Temporary contact entry will give us display name and address if it has it
when there is no contact match
Fixes part of b/7481045 recipient address briefly drawn w/o friendly name
Change-Id: Id5cf6b770d1179c81d9c9b808af4681e632d18a7
diff --git a/chips/src/com/android/ex/chips/RecipientEditTextView.java b/chips/src/com/android/ex/chips/RecipientEditTextView.java
index 7a3c619..011b1e9 100644
--- a/chips/src/com/android/ex/chips/RecipientEditTextView.java
+++ b/chips/src/com/android/ex/chips/RecipientEditTextView.java
@@ -2437,9 +2437,10 @@
// Replace this.
RecipientEntry entry = createValidatedEntry(entries.get(tokenizeAddress(
temp.getEntry().getDestination()).toLowerCase()));
+ // If we don't have a validated contact match, just use the
+ // entry as it existed before.
if (entry == null && !isPhoneQuery()) {
- entry = RecipientEntry.constructFakeEntry(Rfc822Tokenizer.tokenize(temp
- .getEntry().getDestination())[0].getAddress());
+ entry = temp.getEntry();
}
final RecipientEntry tempEntry = entry;
if (tempEntry != null) {
