Merge "fix NPE in CSW#oCC when the ServiceInterface is cleared out" into main (de9ef3fd) · Commits · e / os / android_packages_services_Telecomm

flags/telecom_connection_service_wrapper_flags.aconfig

+11 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,14 @@ flag {
		description: "Ensure that the associatedCallCount of CS and RCS is accurately being tracked."
		bug: "286154316"
		}

		# OWNER=tjstuart TARGET=24Q4
		flag {
		name: "csw_service_interface_is_null"
		namespace: "telecom"
		description: "fix potential NPE in onCreateConnection when the ServiceInterface is cleared out"
		bug: "364811868"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}
		No newline at end of file

+13 −8

Original line number	Diff line number	Diff line
		@@ -1712,6 +1712,11 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		.setRttPipeToInCall(call.getCsToInCallRttPipeForCs())
		.build();
		try {
		if (mFlags.cswServiceInterfaceIsNull() && mServiceInterface == null) {
		mPendingResponses.remove(callId).handleCreateConnectionFailure(
		new DisconnectCause(DisconnectCause.ERROR,
		"CSW#oCC ServiceInterface is null"));
		} else {
		mServiceInterface.createConnection(
		call.getConnectionManagerPhoneAccount(),
		callId,
		@@ -1719,7 +1724,7 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
		call.shouldAttachToExistingConnection(),
		call.isUnknown(),
		Log.getExternalSession(TELECOM_ABBREVIATION));

		}
		} catch (RemoteException e) {
		Log.e(this, e, "Failure to createConnection -- %s", getComponentName());
		mPendingResponses.remove(callId).handleCreateConnectionFailure(