commit f9638451256748295f3a957031912bdde3a8ecf1
author Yorke Lee <yorkelee@google.com> Tue Oct 06 22:15:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 06 22:15:18 2015 +0000
tree 66be6f8c6b4b3f091af2a9c86ab07c20766478f5
parent 7551626fd9ab42a235418a9cb1e753b79edbf3bd
parent 9076086b0f154bfc60b7c36a4161964dfc6019d3

am 3b115d29: am 511440fb: am ad6e03a4: am 568a22f1: Fix potential mismatched caller information

* commit '3b115d297260b401d4350df48ecfd89cd7b235f2':
  Fix potential mismatched caller information

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 41d970f..59f6e7f 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);
         }