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

Commit 666d0984 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update the LE audio device into the media device category"

parents 0dee1961 fa0aec49

src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java

+3 −2
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ public class AvailableMediaBluetoothDeviceUpdater extends BluetoothDeviceUpdater 
            if (DBG) {

                Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);

            }

            // If device is Hearing Aid, it is compatible with HFP and A2DP.

            // If device is Hearing Aid or LE Audio, it is compatible with HFP and A2DP.

            // It would show in Available Devices group.

            if (cachedDevice.isConnectedHearingAidDevice()) {

            if (cachedDevice.isConnectedHearingAidDevice()

                    || cachedDevice.isConnectedLeAudioDevice()) {

                return true;

            }

            // According to the current audio profile type,

src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java

+3 −2
Original line number Diff line number Diff line
@@ -70,9 +70,10 @@ public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater { 
            if (DBG) {

                Log.d(TAG, "isFilterMatched() current audio profile : " + currentAudioProfile);

            }

            // If device is Hearing Aid, it is compatible with HFP and A2DP.

            // If device is Hearing Aid or LE Audio, it is compatible with HFP and A2DP.

            // It would not show in Connected Devices group.

            if (cachedDevice.isConnectedHearingAidDevice()) {

            if (cachedDevice.isConnectedHearingAidDevice()

                    || cachedDevice.isConnectedLeAudioDevice()) {

                return false;

            }

            // According to the current audio profile type,

tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java

+26 −0
Original line number Diff line number Diff line
@@ -234,6 +234,32 @@ public class AvailableMediaBluetoothDeviceUpdaterTest { 
        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);

    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_addPreference() {

        mAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater

                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);



        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);

    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_addPreference() {

        mAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater

                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);



        verify(mBluetoothDeviceUpdater).addPreference(mCachedBluetoothDevice);

    }



    @Test

    public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {

        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java

+27 −0
Original line number Diff line number Diff line
@@ -234,6 +234,33 @@ public class ConnectedBluetoothDeviceUpdaterTest { 
        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);

    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_inCall_removePreference() {

        mAudioManager.setMode(AudioManager.MODE_IN_CALL);

        when(mBluetoothDeviceUpdater

                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);



        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);

    }



    @Test

    public void onProfileConnectionStateChanged_leAudioDeviceConnected_notInCall_removePreference()

    {

        mAudioManager.setMode(AudioManager.MODE_NORMAL);

        when(mBluetoothDeviceUpdater

                .isDeviceConnected(any(CachedBluetoothDevice.class))).thenReturn(true);

        when(mCachedBluetoothDevice.isConnectedLeAudioDevice()).thenReturn(true);



        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,

                BluetoothProfile.STATE_CONNECTED, BluetoothProfile.LE_AUDIO);



        verify(mBluetoothDeviceUpdater).removePreference(mCachedBluetoothDevice);

    }



    @Test

    public void onProfileConnectionStateChanged_deviceDisconnected_removePreference() {

        mBluetoothDeviceUpdater.onProfileConnectionStateChanged(mCachedBluetoothDevice,