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

Commit 69943b88 authored by Grzegorz Kołodziejczyk's avatar Grzegorz Kołodziejczyk Committed by Grzegorz Kolodziejczyk
Browse files

bass: Get subgroup number index from metadata 

For local broadcast there is no Periodic Advertisement result. Previous
solution assumes that updated source was previously external broadcast.

Current solution just get the same information from metaData object
which also contains information about subgroup.

Tag: #feature
Bug: 290883060
Test: atest packages/modules/Bluetooth/android/app/tests/unit/src/com/android/bluetooth/bass_client
Change-Id: Ifb7989c5645358e117cbf6abfd52ca30a9b200aa
parent 62d77111

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

+1 −18
Original line number Diff line number Diff line
@@ -1370,24 +1370,7 @@ public class BassClientStateMachine extends StateMachine { 
            log("no existing SI for update source op");

            return null;

        }

        BluetoothDevice broadcastSource = metaData.getSourceDevice();

        PeriodicAdvertisementResult paRes =

                mService.getPeriodicAdvertisementResult(broadcastSource);

        if (paRes == null) {

            Log.e(TAG, "No matching psync, scan res for update");

            mService.getCallbacks().notifySourceRemoveFailed(

                    mDevice, sourceId, BluetoothStatusCodes.ERROR_UNKNOWN);

            return null;

        }

        // populate metadata from BASE levelOne

        BaseData base = mService.getBase(paRes.getSyncHandle());

        if (base == null) {

            Log.e(TAG, "No valid base data populated for this device");

            mService.getCallbacks().notifySourceRemoveFailed(

                    mDevice, sourceId, BluetoothStatusCodes.ERROR_UNKNOWN);

            return null;

        }

        byte numSubGroups = base.getNumberOfSubgroupsofBIG();

        byte numSubGroups = (byte) metaData.getSubgroups().size();

        byte[] res = new byte[UPDATE_SOURCE_FIXED_LENGTH + numSubGroups * 5];

        int offset = 0;

        // Opcode