Merge "Check if numbers have changed to update the contact cache." into mnc-dev (c72e59c9) · Commits · e / os / android_packages_apps_Dialer

InCallUI/src/com/android/incallui/Call.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;