diff options
author | Roshan Pius <rpius@google.com> | 2015-06-15 18:41:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 18:41:03 +0000 |
commit | ec5f5e74216b658a9ccab8421a83bb9fbb788a77 (patch) | |
tree | 20687c4954f0996d16236f21355b649de99b0dcf /InCallUI | |
parent | 776952c8bede9b3113fc4ea798ad0ed56cc205bf (diff) | |
parent | 376f82d6d4d0e51d0ab81f857a8a11641ff21c24 (diff) |
am 0b54348c: am 0455f5f5: Merge "Check if numbers have changed to update the contact cache." into mnc-dev
* commit '0b54348c3c8be9a370e796f8b41e364e3896152f':
Check if numbers have changed to update the contact cache.
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/src/com/android/incallui/Call.java | 12 | ||||
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 6 |
2 files changed, 16 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/Call.java b/InCallUI/src/com/android/incallui/Call.java index 77d6117ac..da2ef3c07 100644 --- a/InCallUI/src/com/android/incallui/Call.java +++ b/InCallUI/src/com/android/incallui/Call.java @@ -30,6 +30,7 @@ import android.telecom.GatewayInfo; import android.telecom.InCallService.VideoCall; import android.telecom.PhoneAccountHandle; import android.telecom.VideoProfile; +import android.text.TextUtils; import java.util.ArrayList; import java.util.List; @@ -538,6 +539,17 @@ public class Call { return call1.getId().equals(call2.getId()); } + public static boolean areSameNumber(Call call1, Call call2) { + if (call1 == null && call2 == null) { + return true; + } else if (call1 == null || call2 == null) { + return false; + } + + // otherwise compare call Numbers + return TextUtils.equals(call1.getNumber(), call2.getNumber()); + } + public int getSessionModificationState() { return mSessionModificationState; } diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 5cbffa628..c93fe4cb4 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -201,8 +201,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> Log.d(this, "Primary call: " + primary); Log.d(this, "Secondary call: " + secondary); - final boolean primaryChanged = !Call.areSame(mPrimary, primary); - final boolean secondaryChanged = !Call.areSame(mSecondary, secondary); + final boolean primaryChanged = !(Call.areSame(mPrimary, primary) && + Call.areSameNumber(mPrimary, primary)); + final boolean secondaryChanged = !(Call.areSame(mSecondary, secondary) && + Call.areSameNumber(mSecondary, secondary)); mSecondary = secondary; Call previousPrimary = mPrimary; |