Merge "Fix telecom contact name not updating after async query is done" (24883861) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/Call.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -2248,9 +2248,9 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		Log.v(this, "handleCreateConnectionSuccessful %s", connection);
		setTargetPhoneAccount(connection.getPhoneAccount());
		setHandle(connection.getHandle(), connection.getHandlePresentation());

		setCallerDisplayName(
		connection.getCallerDisplayName(), connection.getCallerDisplayNamePresentation());

		setConnectionCapabilities(connection.getConnectionCapabilities());
		setConnectionProperties(connection.getConnectionProperties());
		setIsVoipAudioMode(connection.getIsVoipAudioMode());
		@@ -3394,11 +3394,14 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable,
		return;
		}

		String newName = callerInfo.getName();
		boolean contactNameChanged = mCallerInfo == null \|\| !mCallerInfo.getName().equals(newName);

		mCallerInfo = callerInfo;
		Log.i(this, "CallerInfo received for %s: %s", Log.piiHandle(mHandle), callerInfo);

		if (mCallerInfo.getContactDisplayPhotoUri() == null \|\|
		mCallerInfo.cachedPhotoIcon != null \|\| mCallerInfo.cachedPhoto != null) {
		if (mCallerInfo.getContactDisplayPhotoUri() == null \|\| mCallerInfo.cachedPhotoIcon != null
		\|\| mCallerInfo.cachedPhoto != null \|\| contactNameChanged) {
		for (Listener l : mListeners) {
		l.onCallerInfoChanged(this);
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -805,6 +805,11 @@ public class InCallController extends CallsManagerListenerBase implements
		updateCall(call);
		}

		@Override
		public void onCallerInfoChanged(Call call) {
		updateCall(call);
		}

		/**
		* Listens for changes to extras reported by a Telecom {@link Call}.
		*