commit c62bf0d24324d17e1abcd993bfaf48ce0328df14
author Pranav Madapurmath <pmadapurmath@google.com> Mon Sep 09 18:45:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 18:45:09 2024 +0000
tree b9e8079d6721b22e0eebcd6e72ed2cc8ace69cb4
parent 925e1e2211d8e35e79772d42b83ad6d30b566bf5
parent bd2478818cc6b8eb63de5b2ccf0a6bb781f78840

Merge "Resolve referencing for preferred audio routing" into main

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

diff --git a/src/com/android/server/telecom/CallAudioRouteController.java b/src/com/android/server/telecom/CallAudioRouteController.java
index abee2a8..efd00f2 100644
--- a/src/com/android/server/telecom/CallAudioRouteController.java
+++ b/src/com/android/server/telecom/CallAudioRouteController.java
@@ -1110,8 +1110,7 @@
         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 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);