Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c62bf0d2 authored by Pranav Madapurmath's avatar Pranav Madapurmath Committed by Android (Google) Code Review
Browse files

Merge "Resolve referencing for preferred audio routing" into main

parents 925e1e22 bd247881

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

+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);