Merge "Bass: Fix accessing null reference" into tm-qpr-dev (a53e6ce3) · Commits · e / os / android_packages_modules_Bluetooth

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 =