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

Commit 5b834439 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Gerrit Code Review
Browse files

Merge "Preventing mHearingAidActiveDevices contains null" into main

parents e8fb06c9 89179ba1

android/app/src/com/android/bluetooth/btservice/ActiveDeviceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ public class ActiveDeviceManager implements AdapterService.BluetoothStateCallbac 
            final HearingAidService hearingAidService = mFactory.getHearingAidService();

            if (hearingAidService != null) {

                long hiSyncId = hearingAidService.getHiSyncId(device);

                if (getHearingAidActiveHiSyncIdLocked() == hiSyncId) {

                if (device != null && getHearingAidActiveHiSyncIdLocked() == hiSyncId) {

                    mHearingAidActiveDevices.add(device);

                } else {

                    mHearingAidActiveDevices.clear();

android/app/src/com/android/bluetooth/btservice/AudioRoutingManager.java

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ public class AudioRoutingManager extends ActiveDeviceManager { 
            final HearingAidService hearingAidService = mFactory.getHearingAidService();

            if (hearingAidService != null) {

                long hiSyncId = hearingAidService.getHiSyncId(device);

                if (getHearingAidActiveHiSyncIdLocked() == hiSyncId) {

                if (device != null && getHearingAidActiveHiSyncIdLocked() == hiSyncId) {

                    mHearingAidActiveDevices.add(device);

                } else {

                    mHearingAidActiveDevices.clear();

android/app/tests/unit/src/com/android/bluetooth/btservice/ActiveDeviceManagerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -626,6 +626,13 @@ public class ActiveDeviceManagerTest { 
        Assert.assertTrue(mActiveDeviceManager.getHearingAidActiveDevices().isEmpty());

    }



    @Test

    public void hearingAidActiveWithNull_clearHearingAidActiveDevices() {

        hearingAidActiveDeviceChanged(null);

        TestUtils.waitForLooperToFinishScheduledTask(mActiveDeviceManager.getHandlerLooper());

        assertThat(mActiveDeviceManager.getHearingAidActiveDevices()).isEmpty();

    }



    /**

     * One LE Audio is connected.

     */

android/app/tests/unit/src/com/android/bluetooth/btservice/AudioRoutingManagerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -583,6 +583,13 @@ public class AudioRoutingManagerTest { 
        assertThat(mAudioRoutingManager.getHearingAidActiveDevices().isEmpty()).isTrue();

    }



    @Test

    public void hearingAidActiveWithNull_clearHearingAidActiveDevices() {

        hearingAidActiveDeviceChanged(null);

        TestUtils.waitForLooperToFinishScheduledTask(mAudioRoutingManager.getHandlerLooper());

        assertThat(mAudioRoutingManager.getHearingAidActiveDevices()).isEmpty();

    }



    /** One LE Audio is connected. */

    @Test

    public void onlyLeAudioConnected_setHeadsetActive() {