diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-10-17 22:17:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-17 22:17:54 +0000 |
| commit | c2590357cf857e714f875f2a7c222d1bd128c2c5 (patch) | |
| tree | 8cb92a8b0af7dc9d3278a5e1389f1cc646c26b98 /java/com/android/incallui/CallCardPresenter.java | |
| parent | 0d1362b28afb4a71b8b2a56bad2be3fcf2802de6 (diff) | |
| parent | c8cf79e8e834148ff37759f59e83e169584ee99f (diff) | |
Merge "Some cleanup of incoming call latency."
Diffstat (limited to 'java/com/android/incallui/CallCardPresenter.java')
| -rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 871243c7d..0ef0c9827 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -319,17 +319,19 @@ public class CallCardPresenter previousPrimary.removeListener(this); } - if (mSecondary == null) { - // Secondary call may have ended. Update the ui. - mSecondaryContactInfo = null; - updateSecondaryDisplayInfo(); - } else if (secondaryChanged) { - // secondary call has changed - mSecondaryContactInfo = - ContactInfoCache.buildCacheEntryFromCall( - mContext, mSecondary, mSecondary.getState() == DialerCall.State.INCOMING); - updateSecondaryDisplayInfo(); - maybeStartSearch(mSecondary, false); + if (secondaryChanged) { + if (mSecondary == null) { + // Secondary call may have ended. Update the ui. + mSecondaryContactInfo = null; + updateSecondaryDisplayInfo(); + } else { + // secondary call has changed + mSecondaryContactInfo = + ContactInfoCache.buildCacheEntryFromCall( + mContext, mSecondary, mSecondary.getState() == DialerCall.State.INCOMING); + updateSecondaryDisplayInfo(); + maybeStartSearch(mSecondary, false); + } } // Set the call state |