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

Commit ce677efa authored by Jakub Tyszkowski's avatar Jakub Tyszkowski
Browse files

Bass: Fix accessing null reference 

Test: atest BluetoothInstrumentationTests
Bug: 239665174
Change-Id: I7a1f67d549a7be62b34ea1f0fbf2cada24b671c7
Merged-In: I7a1f67d549a7be62b34ea1f0fbf2cada24b671c7
(cherry picked from commit a1b6ad48)
parent 66cb6df0

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

+5 −3
Original line number Diff line number Diff line
@@ -771,9 +771,11 @@ public class BassClientStateMachine extends StateMachine { 
        log("processBroadcastReceiverState: characteristic:" + characteristic);

        BluetoothLeBroadcastReceiveState recvState = parseBroadcastReceiverState(

                receiverState);

        if (recvState == null || recvState.getSourceId() == -1) {

            log("Null recvState or processBroadcastReceiverState: invalid index: "

                    + recvState.getSourceId());

        if (recvState == null) {

            log("processBroadcastReceiverState: Null recvState");

            return;

        } else if (recvState.getSourceId() == -1) {

            log("processBroadcastReceiverState: invalid index: " + recvState.getSourceId());

            return;

        }

        BluetoothLeBroadcastReceiveState oldRecvState =