commit 070463fa5c8cb252464ad6aae936131f8c939636
author Tyler Gunn <tgunn@google.com> Wed Oct 07 16:03:04 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 07 16:03:04 2015 +0000
tree cc1f41a37853b20bf2e91f63ea035ec9ef4cc7e7
parent 568a22f1d76c83e02b3494a506c21663897d85bb
parent 7a2da71d22645d619e04b1704138f183a5e47724

Merge "Handle child number changes after the call starts." into mnc-dr-dev

src/com/android/incallui/CallCardPresenter.java

diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java
index f0193c4..7833340 100644
--- a/src/com/android/incallui/CallCardPresenter.java
+++ b/src/com/android/incallui/CallCardPresenter.java
@@ -526,7 +526,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);
         }