diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-10-06 22:03:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-06 22:03:09 +0000 |
| commit | 511440fb13c7e988996c0b0f22cd75b5b9f6a7ee (patch) | |
| tree | 8970e2561166b3ee3d059c9ba2b401a174ec7b1d | |
| parent | 305c84f26d8ff3fcf0ff9f68413bde5e6cab6874 (diff) | |
| parent | ad6e03a4087000459bd82b0b49366dcd18117e4b (diff) | |
| download | InCallUI-511440fb13c7e988996c0b0f22cd75b5b9f6a7ee.tar.gz | |
am ad6e03a4: am 568a22f1: Fix potential mismatched caller information
* commit 'ad6e03a4087000459bd82b0b49366dcd18117e4b':
Fix potential mismatched caller information
| -rw-r--r-- | src/com/android/incallui/CallCardPresenter.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/android/incallui/CallCardPresenter.java b/src/com/android/incallui/CallCardPresenter.java index 0cc5da1c..d5972182 100644 --- a/src/com/android/incallui/CallCardPresenter.java +++ b/src/com/android/incallui/CallCardPresenter.java @@ -513,7 +513,15 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } 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); } |