Snap for 12342105 from c62bf0d24324d17e1abcd993bfaf48ce0328df14 to 24Q4-release (0bc757a8) · 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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1110,8 +1110,7 @@ public class CallAudioRouteController implements CallAudioRouteAdapter {
		if (BT_AUDIO_ROUTE_TYPES.contains(type)) {
		return getBluetoothRoute(type, deviceAttr.getAddress());
		} else {
		return mTypeRoutes.get(deviceAttr.getType());

		return mTypeRoutes.get(type);
		}
		}

		@@ -1214,6 +1213,7 @@ public class CallAudioRouteController implements CallAudioRouteAdapter {

		public AudioRoute getBaseRoute(boolean includeBluetooth, String btAddressToExclude) {
		AudioRoute destRoute = getPreferredAudioRouteFromStrategy();
		Log.i(this, "getBaseRoute: preferred audio route is %s", destRoute);
		if (destRoute == null \|\| (destRoute.getBluetoothAddress() != null && (!includeBluetooth
		\|\| destRoute.getBluetoothAddress().equals(btAddressToExclude)))) {
		destRoute = getPreferredAudioRouteFromDefault(includeBluetooth, btAddressToExclude);

+3 −2

Original line number	Diff line number	Diff line
		@@ -2110,8 +2110,9 @@ public class CallAudioRouteStateMachine extends StateMachine implements CallAudi
		private int getCurrentCallSupportedRoutes() {
		int supportedRoutes = CallAudioState.ROUTE_ALL;

		if (mCallsManager.getForegroundCall() != null) {
		supportedRoutes &= mCallsManager.getForegroundCall().getSupportedAudioRoutes();
		Call foregroundCall = mCallsManager.getForegroundCall();
		if (foregroundCall != null) {
		supportedRoutes &= foregroundCall.getSupportedAudioRoutes();
		}

		return supportedRoutes;

+2 −1

Original line number	Diff line number	Diff line
		@@ -2066,7 +2066,8 @@ public class CallsManager extends Call.ListenerBase
		return CompletableFuture.completedFuture(
		Collections.singletonList(suggestion));
		}
		return PhoneAccountSuggestionHelper.bindAndGetSuggestions(mContext,
		Context userContext = mContext.createContextAsUser(getCurrentUserHandle(), 0);
		return PhoneAccountSuggestionHelper.bindAndGetSuggestions(userContext,
		finalCall.getHandle(), potentialPhoneAccounts);
		}, new LoggedHandlerExecutor(outgoingCallHandler, "CM.cOCSS", mLock));

+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(