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

Commit 4b8f7c4a authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

LeAudioService: Fix failing unit test am: d7775db1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20803104



Change-Id: I949bd8130e3c3d3055987db124a3b521c28637b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 50f52e10 d7775db1

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+7 −1
Original line number Diff line number Diff line
@@ -895,7 +895,13 @@ public class LeAudioService extends ProfileService { 
        return false;

    }



    private void notifyActiveDeviceChanged() {

    /**

     * Send broadcast intent about LeAudio active device.

     * This is called when AudioManager confirms, LeAudio device

     * is added or removed.

     */

    @VisibleForTesting

    void notifyActiveDeviceChanged() {

        Intent intent = new Intent(BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED);

        intent.putExtra(BluetoothDevice.EXTRA_DEVICE,

                mActiveAudioOutDevice != null ? mActiveAudioOutDevice : mActiveAudioInDevice);

android/app/tests/unit/src/com/android/bluetooth/le_audio/LeAudioServiceTest.java

+17 −2
Original line number Diff line number Diff line
@@ -1115,8 +1115,16 @@ public class LeAudioServiceTest { 
                         BluetoothLeAudio.CONTEXT_TYPE_CONVERSATIONAL, 3);

        injectGroupStatusChange(testGroupId, BluetoothLeAudio.GROUP_STATUS_ACTIVE);



        String action = BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED;

        /* Expect 2 calles to Audio Manager - one for output and second for input as this is

         * Conversational use case */

        verify(mAudioManager, times(2)).handleBluetoothActiveDeviceChanged(any(), any(),

                        any(BluetoothProfileConnectionInfo.class));

        /* Since LeAudioService called AudioManager - assume Audio manager calles properly callback

        * mAudioManager.onAudioDeviceAdded

        */

        mService.notifyActiveDeviceChanged();



        String action = BluetoothLeAudio.ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED;

        Intent intent = TestUtils.waitForIntent(TIMEOUT_MS, mDeviceQueueMap.get(mSingleDevice));

        assertThat(intent).isNotNull();

        assertThat(action).isEqualTo(intent.getAction());
@@ -1328,7 +1336,10 @@ public class LeAudioServiceTest { 
        assertThat(mService.getActiveDevices().contains(leadDevice)).isTrue();

        verify(mAudioManager, times(1)).handleBluetoothActiveDeviceChanged(eq(leadDevice), any(),

                        any(BluetoothProfileConnectionInfo.class));



        /* Since LeAudioService called AudioManager - assume Audio manager calles properly callback

         * mAudioManager.onAudioDeviceAdded

         */

        mService.notifyActiveDeviceChanged();

        doReturn(BluetoothDevice.BOND_BONDED).when(mAdapterService).getBondState(leadDevice);

        verifyActiveDeviceStateIntent(AUDIO_MANAGER_DEVICE_ADD_TIMEOUT_MS, leadDevice);

        injectNoVerifyDeviceDisconnected(leadDevice);
@@ -1395,6 +1406,10 @@ public class LeAudioServiceTest { 
        assertThat(mService.getActiveDevices().contains(leadDevice)).isTrue();

        verify(mAudioManager, times(1)).handleBluetoothActiveDeviceChanged(eq(leadDevice), any(),

                        any(BluetoothProfileConnectionInfo.class));

        /* Since LeAudioService called AudioManager - assume Audio manager calles properly callback

         * mAudioManager.onAudioDeviceAdded

         */

        mService.notifyActiveDeviceChanged();



        verifyActiveDeviceStateIntent(AUDIO_MANAGER_DEVICE_ADD_TIMEOUT_MS, leadDevice);

        /* We don't want to distribute DISCONNECTION event, instead will try to reconnect