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

Commit 42d55d5a authored by Hui Wang's avatar Hui Wang Committed by Android (Google) Code Review
Browse files

Merge "Do not check whetehr sco is connected for the route deactivation" into main

parents d3615e5f 41c3d51f

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

+2 −1
Original line number Diff line number Diff line
@@ -592,7 +592,8 @@ public class CallAudioRouteController implements CallAudioRouteAdapter { 
        // It's possible that there are multiple HFP devices connected and if we receive SCO audio

        // connected for the destination route's BT device, then we shouldn't disconnect SCO when

        // clearing the communication device for the original route if it was also a HFP device.

        boolean isScoDeviceAlreadyConnected = mScoAudioConnectedDevice != null

        // This does not apply to the route deactivation scenario.

        boolean isScoDeviceAlreadyConnected = mScoAudioConnectedDevice != null && isDestRouteActive

                && Objects.equals(mScoAudioConnectedDevice, mBluetoothRoutes.get(destRoute));

        if (mIsPending) {

            if (destRoute.equals(mPendingAudioRoute.getDestRoute())