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

Commit 05da7aad authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "bass_client: Fix codecId cast issue" am: a5e9ee9b am: 478d7c94 am:... 

Merge "bass_client: Fix codecId cast issue" am: a5e9ee9b am: 478d7c94 am: 51f9e055 am: b0b41c8b am: 243a9618

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



Change-Id: I63e3a04f3c26018fe299cb63da4c6e96e2fa8938
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d07ba492 243a9618

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

+1 −5
Original line number Diff line number Diff line
@@ -412,11 +412,7 @@ public class BassClientStateMachine extends StateMachine { 
                channel.setSelected(false);

                subGroup.addChannel(channel.build());

            }

            subGroup.setCodecId((long)(baseLevel2.codecId[4] << 32

                    | baseLevel2.codecId[3] << 24

                    | baseLevel2.codecId[2] << 16

                    | baseLevel2.codecId[1] << 8

                    | baseLevel2.codecId[0]));

            subGroup.setCodecId(ByteBuffer.wrap(baseLevel2.codecId).getLong());

            subGroup.setCodecSpecificConfig(BluetoothLeAudioCodecConfigMetadata.

                    fromRawBytes(baseLevel2.codecConfigInfo));

            subGroup.setContentMetadata(BluetoothLeAudioContentMetadata.