diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-01-24 03:43:48 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-24 03:43:48 +0000 |
commit | 418a818639a2dad7ed9f06b0785ed4f55966f56e (patch) | |
tree | da92ce9fd395e557c13768e7d6338764d0b0b0b5 /java/com/android/incallui/CallCardPresenter.java | |
parent | 0e691c844358955ad4f08d5847201a4663b7d844 (diff) | |
parent | 9a833fc03677a14724b235c85c5e896ea3ab48b3 (diff) |
Merge changes Iccee9278,I04305998
* changes:
Updated nearby places search permission icon for Material.
Updated call number by NW is not displayed
Diffstat (limited to 'java/com/android/incallui/CallCardPresenter.java')
-rw-r--r-- | java/com/android/incallui/CallCardPresenter.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index eed076d3d..bdbbe8f7c 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -117,7 +117,9 @@ public class CallCardPresenter private final Handler handler = new Handler(); private DialerCall primary; + private String primaryNumber; private DialerCall secondary; + private String secondaryNumber; private ContactCacheEntry primaryContactInfo; private ContactCacheEntry secondaryContactInfo; @Nullable private ContactsPreferences contactsPreferences; @@ -284,17 +286,27 @@ public class CallCardPresenter LogUtil.v("CallCardPresenter.onStateChange", "primary call: " + primary); LogUtil.v("CallCardPresenter.onStateChange", "secondary call: " + secondary); + String primaryNumber = null; + String secondaryNumber = null; + if (primary != null) { + primaryNumber = primary.getNumber(); + } + if (secondary != null) { + secondaryNumber = secondary.getNumber(); + } final boolean primaryChanged = !(DialerCall.areSame(this.primary, primary) - && DialerCall.areSameNumber(this.primary, primary)); + && TextUtils.equals(this.primaryNumber, primaryNumber)); final boolean secondaryChanged = !(DialerCall.areSame(this.secondary, secondary) - && DialerCall.areSameNumber(this.secondary, secondary)); + && TextUtils.equals(this.secondaryNumber, secondaryNumber)); this.secondary = secondary; + this.secondaryNumber = secondaryNumber; DialerCall previousPrimary = this.primary; this.primary = primary; + this.primaryNumber = primaryNumber; if (this.primary != null) { InCallPresenter.getInstance().onForegroundCallChanged(this.primary); |