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

Commit da876b8e authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[Bluetooth] Consider LE_AUDIO to be an audio-only bluetooth profile."... 

Merge "[Bluetooth] Consider LE_AUDIO to be an audio-only bluetooth profile." into udc-dev am: aa970407 am: ab235537

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23263576



Change-Id: Iaa53fd8ba14f93fdafb19e8e65bd8d004848f2e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62c132f0 ab235537

packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa 
        for (CachedBluetoothDevice device : getDevices()) {

            isActive |= device.isActiveDevice(BluetoothProfile.HEADSET)

                    || device.isActiveDevice(BluetoothProfile.A2DP)

                    || device.isActiveDevice(BluetoothProfile.HEARING_AID);

                    || device.isActiveDevice(BluetoothProfile.HEARING_AID)

                    || device.isActiveDevice(BluetoothProfile.LE_AUDIO);

        }



        if (mIsActive != isActive) {
@@ -315,7 +316,8 @@ public class BluetoothControllerImpl implements BluetoothController, BluetoothCa 
                boolean isConnected = device.isConnectedProfile(profile);

                if (profileId == BluetoothProfile.HEADSET

                        || profileId == BluetoothProfile.A2DP

                        || profileId == BluetoothProfile.HEARING_AID) {

                        || profileId == BluetoothProfile.HEARING_AID

                        || profileId == BluetoothProfile.LE_AUDIO) {

                    audioProfileConnected |= isConnected;

                } else {

                    otherProfileConnected |= isConnected;

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BluetoothControllerImplTest.java

+162 −10
Original line number Diff line number Diff line
@@ -284,16 +284,8 @@ public class BluetoothControllerImplTest extends SysuiTestCase { 
        assertFalse(mBluetoothControllerImpl.isBluetoothAudioActive());

        assertFalse(mBluetoothControllerImpl.isBluetoothAudioProfileOnly());



        CachedBluetoothDevice device = mock(CachedBluetoothDevice.class);

        mDevices.add(device);

        when(device.isActiveDevice(BluetoothProfile.HEADSET)).thenReturn(true);



        List<LocalBluetoothProfile> profiles = new ArrayList<>();

        LocalBluetoothProfile profile = mock(LocalBluetoothProfile.class);

        profiles.add(profile);

        when(profile.getProfileId()).thenReturn(BluetoothProfile.HEADSET);

        when(device.getProfiles()).thenReturn(profiles);

        when(device.isConnectedProfile(profile)).thenReturn(true);

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.HEADSET, /* isConnected= */ true, /* isActive= */ true);



        mBluetoothControllerImpl.onAclConnectionStateChanged(device,

                BluetoothProfile.STATE_CONNECTED);
@@ -303,6 +295,149 @@ public class BluetoothControllerImplTest extends SysuiTestCase { 
        assertTrue(mBluetoothControllerImpl.isBluetoothAudioProfileOnly());

    }



    @Test

    public void isBluetoothAudioActive_headsetIsActive_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.HEADSET, /* isConnected= */ true, /* isActive= */ true);



        mBluetoothControllerImpl.onActiveDeviceChanged(device, BluetoothProfile.HEADSET);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioActive()).isTrue();

    }



    @Test

    public void isBluetoothAudioActive_a2dpIsActive_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.A2DP, /* isConnected= */ true, /* isActive= */ true);



        mBluetoothControllerImpl.onActiveDeviceChanged(device, BluetoothProfile.A2DP);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioActive()).isTrue();

    }



    @Test

    public void isBluetoothAudioActive_hearingAidIsActive_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.HEARING_AID, /* isConnected= */ true, /* isActive= */ true);



        mBluetoothControllerImpl.onActiveDeviceChanged(device, BluetoothProfile.HEARING_AID);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioActive()).isTrue();

    }



    @Test

    public void isBluetoothAudioActive_leAudioIsActive_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.LE_AUDIO, /* isConnected= */ true, /* isActive= */ true);



        mBluetoothControllerImpl.onActiveDeviceChanged(device, BluetoothProfile.LE_AUDIO);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioActive()).isTrue();

    }



    @Test

    public void isBluetoothAudioActive_otherProfile_false() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.PAN, /* isConnected= */ true, /* isActive= */ true);



        mBluetoothControllerImpl.onActiveDeviceChanged(device, BluetoothProfile.PAN);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioActive()).isFalse();

    }



    @Test

    public void isBluetoothAudioActive_leAudio_butNotActive_false() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.LE_AUDIO, /* isConnected= */ true, /* isActive= */ false);



        mBluetoothControllerImpl.onActiveDeviceChanged(device, BluetoothProfile.LE_AUDIO);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioActive()).isFalse();

    }



    @Test

    public void isBluetoothAudioProfileOnly_noneConnected_false() {

        CachedBluetoothDevice device1 = createBluetoothDevice(

                BluetoothProfile.LE_AUDIO, /* isConnected= */ false, /* isActive= */ false);

        CachedBluetoothDevice device2 = createBluetoothDevice(

                BluetoothProfile.HEADSET, /* isConnected= */ false, /* isActive= */ false);



        mBluetoothControllerImpl.onDeviceAdded(device1);

        mBluetoothControllerImpl.onDeviceAdded(device2);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioProfileOnly()).isFalse();

    }



    /** Regression test for b/278982782. */

    @Test

    public void isBluetoothAudioProfileOnly_onlyLeAudioConnected_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.LE_AUDIO, /* isConnected= */ true, /* isActive= */ false);



        mBluetoothControllerImpl.onDeviceAdded(device);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioProfileOnly()).isTrue();

    }



    @Test

    public void isBluetoothAudioProfileOnly_onlyHeadsetConnected_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.HEADSET, /* isConnected= */ true, /* isActive= */ false);



        mBluetoothControllerImpl.onDeviceAdded(device);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioProfileOnly()).isTrue();

    }



    @Test

    public void isBluetoothAudioProfileOnly_onlyA2dpConnected_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.A2DP, /* isConnected= */ true, /* isActive= */ false);



        mBluetoothControllerImpl.onDeviceAdded(device);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioProfileOnly()).isTrue();

    }



    @Test

    public void isBluetoothAudioProfileOnly_onlyHearingAidConnected_true() {

        CachedBluetoothDevice device = createBluetoothDevice(

                BluetoothProfile.HEARING_AID, /* isConnected= */ true, /* isActive= */ false);



        mBluetoothControllerImpl.onDeviceAdded(device);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioProfileOnly()).isTrue();

    }



    @Test

    public void isBluetoothAudioProfileOnly_multipleAudioOnlyProfilesConnected_true() {

        CachedBluetoothDevice device1 = createBluetoothDevice(

                BluetoothProfile.LE_AUDIO, /* isConnected= */ true, /* isActive= */ false);

        CachedBluetoothDevice device2 = createBluetoothDevice(

                BluetoothProfile.A2DP, /* isConnected= */ true, /* isActive= */ false);

        CachedBluetoothDevice device3 = createBluetoothDevice(

                BluetoothProfile.HEADSET, /* isConnected= */ true, /* isActive= */ false);



        mBluetoothControllerImpl.onDeviceAdded(device1);

        mBluetoothControllerImpl.onDeviceAdded(device2);

        mBluetoothControllerImpl.onDeviceAdded(device3);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioProfileOnly()).isTrue();

    }



    @Test

    public void isBluetoothAudioProfileOnly_leAudioAndOtherProfileConnected_false() {

        CachedBluetoothDevice device1 = createBluetoothDevice(

                BluetoothProfile.LE_AUDIO, /* isConnected= */ true, /* isActive= */ false);

        CachedBluetoothDevice device2 = createBluetoothDevice(

                BluetoothProfile.PAN, /* isConnected= */ true, /* isActive= */ false);



        mBluetoothControllerImpl.onDeviceAdded(device1);

        mBluetoothControllerImpl.onDeviceAdded(device2);



        assertThat(mBluetoothControllerImpl.isBluetoothAudioProfileOnly()).isFalse();

    }



    @Test

    public void testAddOnMetadataChangedListener_registersListenerOnAdapter() {

        CachedBluetoothDevice cachedDevice = mock(CachedBluetoothDevice.class);
@@ -336,4 +471,21 @@ public class BluetoothControllerImplTest extends SysuiTestCase { 
        mBluetoothControllerImpl.onActiveDeviceChanged(null, BluetoothProfile.HEADSET);

        // No assert, just need no crash.

    }



    private CachedBluetoothDevice createBluetoothDevice(

            int profile, boolean isConnected, boolean isActive) {

        CachedBluetoothDevice device = mock(CachedBluetoothDevice.class);

        mDevices.add(device);

        when(device.isActiveDevice(profile)).thenReturn(isActive);



        List<LocalBluetoothProfile> localBluetoothProfiles = new ArrayList<>();

        LocalBluetoothProfile localBluetoothProfile = mock(LocalBluetoothProfile.class);

        localBluetoothProfiles.add(localBluetoothProfile);

        when(device.getProfiles()).thenReturn(localBluetoothProfiles);



        when(localBluetoothProfile.getProfileId()).thenReturn(profile);

        when(device.isConnectedProfile(localBluetoothProfile)).thenReturn(isConnected);



        return device;

    }

}