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

Commit 9f2de5ff authored by Michal Belusiak (xWF)'s avatar Michal Belusiak (xWF) Committed by Automerger Merge Worker
Browse files

Merge "Bass: Update method to get sinks synced to the broadcasts" into main am: 98239581 

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



Change-Id: I0bddc2e2e12c95ef70d0f776b87997c07f3ad01f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b01c04f 98239581

android/app/src/com/android/bluetooth/bass_client/BassClientService.java

+21 −16
Original line number Diff line number Diff line
@@ -3363,12 +3363,16 @@ public class BassClientService extends ProfileService { 
        return isReceivingExternalBroadcast;

    }



    /** Get the active broadcast sink devices receiving broadcast stream */

    public List<BluetoothDevice> getActiveBroadcastSinks() {

    /** Get sink devices synced to the broadcasts */

    public List<BluetoothDevice> getSyncedBroadcastSinks() {

        List<BluetoothDevice> activeSinks = new ArrayList<>();



        for (BluetoothDevice device : getConnectedDevices()) {

            // Check if any device's source in active sync state

            if (leaudioBigDependsOnAudioState()) {

                if (!getAllSources(device).isEmpty()) {

                    activeSinks.add(device);

                }

            } else {

                if (getAllSources(device).stream()

                        .anyMatch(

                                receiveState ->
@@ -3384,6 +3388,7 @@ public class BassClientService extends ProfileService { 
                    activeSinks.add(device);

                }

            }

        }

        return activeSinks;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -4333,7 +4333,7 @@ public class LeAudioService extends ProfileService { 


            BassClientService bassClientService = getBassClientService();

            if (bassClientService != null) {

                activeBroadcastSinks = bassClientService.getActiveBroadcastSinks();

                activeBroadcastSinks = bassClientService.getSyncedBroadcastSinks();

            }



            if (activeBroadcastSinks.isEmpty()) {

android/app/tests/unit/src/com/android/bluetooth/bass_client/BassClientServiceTest.java

+64 −8
Original line number Diff line number Diff line
@@ -4047,7 +4047,7 @@ public class BassClientServiceTest { 
        // Verify isAnyReceiverReceivingBroadcast returns false if no BIS synced

        assertThat(mBassClientService.isAnyReceiverReceivingBroadcast(devices)).isFalse();



        // Update receiver state with lost BIS sync

        // Update receiver state with BIS sync

        for (BassClientStateMachine sm : mStateMachines.values()) {

            if (sm.getDevice().equals(mCurrentDevice)) {

                injectRemoteSourceStateChanged(
@@ -4084,12 +4084,28 @@ public class BassClientServiceTest { 
    }



    @Test

    public void testGetActiveBroadcastSinks() {

    public void testGetSyncedBroadcastSinks() {

        prepareConnectedDeviceGroup();

        startSearchingForSources();

        onScanResult(mSourceDevice, TEST_BROADCAST_ID);

        onSyncEstablished(mSourceDevice, TEST_SYNC_HANDLE);

        BluetoothLeBroadcastMetadata meta = createBroadcastMetadata(TEST_BROADCAST_ID);

        BluetoothLeBroadcastMetadata.Builder builder =

                new BluetoothLeBroadcastMetadata.Builder()

                        .setEncrypted(false)

                        .setSourceDevice(

                                mBluetoothAdapter.getRemoteLeDevice(

                                        "00:00:00:00:00:00", BluetoothDevice.ADDRESS_TYPE_RANDOM),

                                BluetoothDevice.ADDRESS_TYPE_RANDOM)

                        .setSourceAdvertisingSid(TEST_ADVERTISER_SID)

                        .setBroadcastId(0)

                        .setBroadcastCode(null)

                        .setPaSyncInterval(TEST_PA_SYNC_INTERVAL)

                        .setPresentationDelayMicros(TEST_PRESENTATION_DELAY_MS);

        // builder expect at least one subgroup

        builder.addSubgroup(createBroadcastSubgroup());

        BluetoothLeBroadcastMetadata metaNoBroadcast = builder.build();



        verifyAddSourceForGroup(meta);

        for (BassClientStateMachine sm : mStateMachines.values()) {

            if (sm.getDevice().equals(mCurrentDevice)) {
@@ -4105,7 +4121,7 @@ public class BassClientServiceTest { 
                        null);

                injectRemoteSourceStateChanged(

                        sm,

                        meta,

                        metaNoBroadcast,

                        TEST_SOURCE_ID,

                        BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_SYNCHRONIZED,

                        meta.isEncrypted()
@@ -4125,6 +4141,38 @@ public class BassClientServiceTest { 
                                : BluetoothLeBroadcastReceiveState

                                        .BIG_ENCRYPTION_STATE_NOT_ENCRYPTED,

                        null);

                injectRemoteSourceStateChanged(

                        sm,

                        metaNoBroadcast,

                        TEST_SOURCE_ID + 1,

                        BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_SYNCHRONIZED,

                        meta.isEncrypted()

                                ? BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_DECRYPTING

                                : BluetoothLeBroadcastReceiveState

                                        .BIG_ENCRYPTION_STATE_NOT_ENCRYPTED,

                        null,

                        (long) 0x00000000);

            }

        }



        // Verify getSyncedBroadcastSinks returns empty device list if no broadcst ID

        assertThat(mBassClientService.getSyncedBroadcastSinks().isEmpty()).isTrue();



        // Update receiver state with broadcast ID

        for (BassClientStateMachine sm : mStateMachines.values()) {

            if (sm.getDevice().equals(mCurrentDevice)) {

                injectRemoteSourceStateChanged(

                        sm,

                        meta,

                        TEST_SOURCE_ID,

                        BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_SYNCHRONIZED,

                        meta.isEncrypted()

                                ? BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_DECRYPTING

                                : BluetoothLeBroadcastReceiveState

                                        .BIG_ENCRYPTION_STATE_NOT_ENCRYPTED,

                        null,

                        (long) 0x00000000);

            } else if (sm.getDevice().equals(mCurrentDevice1)) {

                injectRemoteSourceStateChanged(

                        sm,

                        meta,
@@ -4139,10 +4187,18 @@ public class BassClientServiceTest { 
            }

        }



        // Verify isAnyReceiverReceivingBroadcast returns empty device list if no BIS synced

        assertThat(mBassClientService.getActiveBroadcastSinks().isEmpty()).isTrue();

        List<BluetoothDevice> activeSinks = mBassClientService.getSyncedBroadcastSinks();

        if (Flags.leaudioBigDependsOnAudioState()) {

            // Verify getSyncedBroadcastSinks returns correct device list if no BIS synced

            assertThat(activeSinks.size()).isEqualTo(2);

            assertThat(activeSinks.contains(mCurrentDevice)).isTrue();

            assertThat(activeSinks.contains(mCurrentDevice1)).isTrue();

        } else {

            // Verify getSyncedBroadcastSinks returns empty device list if no BIS synced

            assertThat(mBassClientService.getSyncedBroadcastSinks().isEmpty()).isTrue();

        }



        // Update receiver state with lost BIS sync

        // Update receiver state with BIS sync

        for (BassClientStateMachine sm : mStateMachines.values()) {

            if (sm.getDevice().equals(mCurrentDevice)) {

                injectRemoteSourceStateChanged(
@@ -4170,9 +4226,9 @@ public class BassClientServiceTest { 
                        (long) 0x00000002);

            }

        }

        List<BluetoothDevice> activeSinks = mBassClientService.getActiveBroadcastSinks();



        // Verify isAnyReceiverReceivingBroadcast returns correct device list if BIS synced

        // Verify getSyncedBroadcastSinks returns correct device list if BIS synced

        activeSinks = mBassClientService.getSyncedBroadcastSinks();

        assertThat(activeSinks.size()).isEqualTo(2);

        assertThat(activeSinks.contains(mCurrentDevice)).isTrue();

        assertThat(activeSinks.contains(mCurrentDevice1)).isTrue();

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

+4 −4
Original line number Diff line number Diff line
@@ -2677,16 +2677,16 @@ public class LeAudioServiceTest { 
                        eq(null), any(), any(BluetoothProfileConnectionInfo.class));

        TestUtils.waitForLooperToFinishScheduledTask(mService.getMainLooper());



        // Verify setGroupVolume will not be called if no active sinks

        doReturn(new ArrayList<>()).when(mBassClientService).getActiveBroadcastSinks();

        // Verify setGroupVolume will not be called if no synced sinks

        doReturn(new ArrayList<>()).when(mBassClientService).getSyncedBroadcastSinks();

        mService.setVolume(newVolume);

        verify(mVolumeControlService, never()).setGroupVolume(groupId, newVolume);



        mService.mUnicastGroupIdDeactivatedForBroadcastTransition = groupId;

        // Verify setGroupVolume will be called if active sinks

        // Verify setGroupVolume will be called if synced sinks

        doReturn(List.of(mLeftDevice, mRightDevice, mSingleDevice))

                .when(mBassClientService)

                .getActiveBroadcastSinks();

                .getSyncedBroadcastSinks();

        mService.setVolume(newVolume);



        // Verify set volume only on primary group