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

Commit 680536d7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10975086 from 880994b1 to 24Q1-release

Change-Id: I2a45fe3c8d31f9fbdc66fd462b52a1a3193d8a1b
parents 034d4771 880994b1
Loading
Loading
Loading
Loading
+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();
+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();
+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.
     */
+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() {
+4 −1
Original line number Diff line number Diff line
@@ -64,7 +64,10 @@ android_test {
        "configs/pts_bot_tests_config.json",
        "configs/pts_bot_tests_config_auto.json",
    ],
    test_suites: ["device-tests"],
    test_suites: [
        "device-tests",
        "general-tests",
    ],
    min_sdk_version: "Tiramisu",
}

Loading