commit 83ec9d872e6a6a14b2afea65f3b4b7b549e57a8a
author Yorke Lee <yorkelee@google.com> Wed Oct 07 00:39:44 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 07 00:39:44 2015 +0000
tree 4e8ee1e1eb40dfacaa338c1e3a877dc2cb974f0a
parent 4276408e68e70354ab4b2dfdc96f612e2a358485
parent a0eeeaa20c895d4ac15d7dd7045c816c81cedaf5

Merge "DO NOT MERGE Fix potential mismatched caller information" into ub-contactsdialer-a-dev

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 2cd6b6e..ae1a48a 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -516,7 +516,15 @@
     }
 
     private void onContactInfoComplete(String callId, ContactCacheEntry entry, boolean isPrimary) {
-        updateContactEntry(entry, isPrimary);
+        final boolean entryMatchesExistingCall =
+                (isPrimary && mPrimary != null && TextUtils.equals(callId,  mPrimary.getId())) ||
+                (!isPrimary && mSecondary != null && TextUtils.equals(callId, mSecondary.getId()));
+        if (entryMatchesExistingCall) {
+            updateContactEntry(entry, isPrimary);
+        } else {
+            Log.w(this, "Dropping stale contact lookup info for " + callId);
+        }
+
         if (entry.name != null) {
             Log.d(TAG, "Contact found: " + entry);
         }