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

Commit cbbb2aab authored by Hall Liu's avatar Hall Liu
Browse files

Check whether there's a BT active device on reset 

When CARSM resets after a call, check the BT active device before
setting the initial audio route.

Bug: 78689624
Test: manual, unit
Change-Id: I82ed2be7db27f1187aa85ea1387319446c11bbbf
parent fcab991d

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

+2 −1
Original line number Diff line number Diff line
@@ -1624,7 +1624,8 @@ public class CallAudioRouteStateMachine extends StateMachine { 
        int supportedRouteMask = calculateSupportedRoutes() & getCurrentCallSupportedRoutes();

        final int route;



        if ((supportedRouteMask & ROUTE_BLUETOOTH) != 0) {

        if ((supportedRouteMask & ROUTE_BLUETOOTH) != 0

                && mBluetoothRouteManager.hasBtActiveDevice()) {

            route = ROUTE_BLUETOOTH;

        } else if ((supportedRouteMask & ROUTE_WIRED_HEADSET) != 0) {

            route = ROUTE_WIRED_HEADSET;

src/com/android/server/telecom/bluetooth/BluetoothRouteManager.java

+4 −0
Original line number Diff line number Diff line
@@ -568,6 +568,10 @@ public class BluetoothRouteManager extends StateMachine { 
        }

    }



    public boolean hasBtActiveDevice() {

        return mActiveDeviceCache != null;

    }



    public Collection<BluetoothDevice> getConnectedDevices() {

        return mDeviceManager.getConnectedDevices();

    }

tests/src/com/android/server/telecom/tests/CallAudioRouteStateMachineTest.java

+23 −0
Original line number Diff line number Diff line
@@ -538,12 +538,35 @@ public class CallAudioRouteStateMachineTest extends TelecomSystemTest { 
        initializationTestHelper(expectedState, CallAudioRouteStateMachine.EARPIECE_FORCE_DISABLED);

    }



    @SmallTest

    @Test

    public void testInitializationWithAvailableButInactiveBtDevice() {

        CallAudioState expectedState = new CallAudioState(false, CallAudioState.ROUTE_EARPIECE,

                CallAudioState.ROUTE_SPEAKER | CallAudioState.ROUTE_BLUETOOTH

                        | CallAudioState.ROUTE_EARPIECE);

        when(mockBluetoothRouteManager.isBluetoothAvailable()).thenReturn(true);

        when(mockBluetoothRouteManager.hasBtActiveDevice()).thenReturn(false);



        CallAudioRouteStateMachine stateMachine = new CallAudioRouteStateMachine(

                mContext,

                mockCallsManager,

                mockBluetoothRouteManager,

                mockWiredHeadsetManager,

                mockStatusBarNotifier,

                mAudioServiceFactory,

                CallAudioRouteStateMachine.EARPIECE_FORCE_ENABLED);

        stateMachine.initialize();

        assertEquals(expectedState, stateMachine.getCurrentCallAudioState());

    }



    private void initializationTestHelper(CallAudioState expectedState,

            int earpieceControl) {

        when(mockWiredHeadsetManager.isPluggedIn()).thenReturn(

                (expectedState.getSupportedRouteMask() & CallAudioState.ROUTE_WIRED_HEADSET) != 0);

        when(mockBluetoothRouteManager.isBluetoothAvailable()).thenReturn(

                (expectedState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH) != 0);

        when(mockBluetoothRouteManager.hasBtActiveDevice()).thenReturn(

                (expectedState.getSupportedRouteMask() & CallAudioState.ROUTE_BLUETOOTH) != 0);



        CallAudioRouteStateMachine stateMachine = new CallAudioRouteStateMachine(

                mContext,