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

Commit cb5647eb authored by Rongxuan Liu's avatar Rongxuan Liu
Browse files

[le audio] notify source added with broadcast source id 

In current code, a fake id 0 is used in onSourceAdded callback.
This will cause the App get incorrect source id which will be used to
remove the source later.
Fix is to use the source id from receiver state.

Tag: #bug
Bug: 286890282
Test: atest BassClientServiceTest
Change-Id: I763a51ffafb7f9818697067671eebbb698b40b3b
parent 1f3c9b0e

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

+1 −1
Original line number Diff line number Diff line
@@ -1488,7 +1488,7 @@ public class BassClientService extends ProfileService { 
        void notifySourceAdded(BluetoothDevice sink, BluetoothLeBroadcastReceiveState recvState,

                int reason) {

            ObjParams param = new ObjParams(sink, recvState);

            obtainMessage(MSG_SOURCE_ADDED, reason, 0, param).sendToTarget();

            obtainMessage(MSG_SOURCE_ADDED, reason, recvState.getSourceId(), param).sendToTarget();

        }



        void notifySourceAddFailed(BluetoothDevice sink, BluetoothLeBroadcastMetadata source,

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

+44 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static org.mockito.Mockito.doReturn; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.notNull;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -565,6 +566,49 @@ public class BassClientServiceTest { 
        verifyAddSourceForGroup(meta);

    }





    /**

     * Test whether service.addSource() source id can be propagated through callback correctly

     */

    @Test

    public void testAddSourceCallbackForGroup() {

        prepareConnectedDeviceGroup();

        BluetoothLeBroadcastMetadata meta = createBroadcastMetadata(TEST_BROADCAST_ID);

        verifyAddSourceForGroup(meta);

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

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

                injectRemoteSourceState(sm, meta, TEST_SOURCE_ID,

                        BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_IDLE,

                        meta.isEncrypted() ?

                                BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_DECRYPTING :

                                BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_NOT_ENCRYPTED,

                        null);

                // verify source id

                try {

                    verify(mCallback, timeout(TIMEOUT_MS).atLeastOnce()).

                            onSourceAdded(eq(mCurrentDevice), eq(TEST_SOURCE_ID),

                            eq(BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST));

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                }

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

                injectRemoteSourceState(sm, meta, TEST_SOURCE_ID + 1,

                        BluetoothLeBroadcastReceiveState.PA_SYNC_STATE_IDLE,

                        meta.isEncrypted() ?

                                BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_DECRYPTING :

                                BluetoothLeBroadcastReceiveState.BIG_ENCRYPTION_STATE_NOT_ENCRYPTED,

                        null);

                // verify source id

                try {

                    verify(mCallback, timeout(TIMEOUT_MS).atLeastOnce()).

                            onSourceAdded(eq(mCurrentDevice1), eq(TEST_SOURCE_ID + 1),

                            eq(BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST));

                } catch (RemoteException e) {

                    throw e.rethrowFromSystemServer();

                }

            }

        }

    }

   /**

     * Test whether service.modifySource() does send proper messages to all the

     * state machines within the Csip coordinated group