Merge cherrypicks of ['googleplex-android-review.googlesource.com/29393068'] into 24Q4-release. (0ce228c5) · Commits · e / os / android_packages_services_Telecomm

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

+11 −1

Original line number	Diff line number	Diff line
		@@ -911,7 +911,7 @@ public class CallAudioRouteController implements CallAudioRouteAdapter {
		}

		private void handleSwitchBaselineRoute(boolean includeBluetooth, String btAddressToExclude) {
		routeTo(mIsActive, getBaseRoute(includeBluetooth, btAddressToExclude));
		routeTo(mIsActive, calculateBaselineRoute(includeBluetooth, btAddressToExclude));
		}

		private void handleSpeakerOn() {
		@@ -1225,6 +1225,16 @@ public class CallAudioRouteController implements CallAudioRouteAdapter {
		return destRoute;
		}

		private AudioRoute calculateBaselineRoute(boolean includeBluetooth, String btAddressToExclude) {
		AudioRoute destRoute = getPreferredAudioRouteFromDefault(
		includeBluetooth, btAddressToExclude);
		if (destRoute != null && !getCallSupportedRoutes().contains(destRoute)) {
		destRoute = null;
		}
		Log.i(this, "getBaseRoute - audio routing to %s", destRoute);
		return destRoute;
		}

		/**
		* Don't add additional AudioRoute when a hearing aid pair is detected. The devices have
		* separate addresses, so we need to perform explicit handling to ensure we don't