Snap for 8474198 from d25baf7e4fbcd10e9fb83fc5ce05c0f736f9043c to tm-release (aed886e5) · Commits · e / os / android_packages_services_Telecomm

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

+26 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@ import java.util.List;
		import java.util.Map;
		import java.util.Set;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.Objects;

		/**
		* Wrapper for {@link IConnectionService}s, handles binding to {@link IConnectionService} and keeps
		@@ -967,6 +968,31 @@ public class ConnectionServiceWrapper extends ServiceBinder implements

		if (alreadyAddedConnection != null
		&& mCallIdMapper.getCall(callId) == null) {
		if (!Objects.equals(connection.getHandle(),
		alreadyAddedConnection.getHandle())) {
		alreadyAddedConnection.setHandle(connection.getHandle());
		}
		if (connection.getHandlePresentation() !=
		alreadyAddedConnection.getHandlePresentation()) {
		alreadyAddedConnection.setHandle(connection.getHandle(),
		connection.getHandlePresentation());
		}
		if (!Objects.equals(connection.getCallerDisplayName(),
		alreadyAddedConnection.getCallerDisplayName())) {
		alreadyAddedConnection.setCallerDisplayName(connection
		.getCallerDisplayName(),
		connection.getCallerDisplayNamePresentation());
		}
		if (connection.getConnectionCapabilities() !=
		alreadyAddedConnection.getConnectionCapabilities()) {
		alreadyAddedConnection.setConnectionCapabilities(connection
		.getConnectionCapabilities());
		}
		if (connection.getConnectionProperties() !=
		alreadyAddedConnection.getConnectionProperties()) {
		alreadyAddedConnection.setConnectionCapabilities(connection
		.getConnectionProperties());
		}
		mCallIdMapper.addCall(alreadyAddedConnection, callId);
		alreadyAddedConnection
		.replaceConnectionService(ConnectionServiceWrapper.this);