Merge "BassClientService: Fix multiple crashes when searching for broadcasters" (ae9b04a5) · Commits · e / os / android_packages_modules_Bluetooth

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

+35 −8

Original line number	Diff line number	Diff line
		@@ -476,9 +476,16 @@ public class BassClientStateMachine extends StateMachine {
		BluetoothLeBroadcastChannel.Builder channel =
		new BluetoothLeBroadcastChannel.Builder();
		channel.setChannelIndex(baseLevel3.index);
		channel.setCodecMetadata(BluetoothLeAudioCodecConfigMetadata.
		fromRawBytes(baseLevel3.codecConfigInfo));
		channel.setSelected(false);
		try {
		channel.setCodecMetadata(
		BluetoothLeAudioCodecConfigMetadata.fromRawBytes(
		baseLevel3.codecConfigInfo));
		} catch (IllegalArgumentException e) {
		Log.w(TAG, "Invalid metadata, adding empty data. Error: " + e);
		channel.setCodecMetadata(
		BluetoothLeAudioCodecConfigMetadata.fromRawBytes(new byte[0]));
		}
		subGroup.addChannel(channel.build());
		}
		byte[] arrayCodecId = baseLevel2.codecId;
		@@ -488,10 +495,25 @@ public class BassClientStateMachine extends StateMachine {
		\| (arrayCodecId[1] & 0xff) << 8
		\| (arrayCodecId[0] & 0xff);
		subGroup.setCodecId(codeId);
		subGroup.setCodecSpecificConfig(BluetoothLeAudioCodecConfigMetadata.
		fromRawBytes(baseLevel2.codecConfigInfo));
		subGroup.setContentMetadata(BluetoothLeAudioContentMetadata.
		fromRawBytes(baseLevel2.metaData));
		try {
		subGroup.setCodecSpecificConfig(
		BluetoothLeAudioCodecConfigMetadata.fromRawBytes(
		baseLevel2.codecConfigInfo));
		} catch (IllegalArgumentException e) {
		Log.w(TAG, "Invalid config, adding empty one. Error: " + e);
		subGroup.setCodecSpecificConfig(
		BluetoothLeAudioCodecConfigMetadata.fromRawBytes(new byte[0]));
		}

		try {
		subGroup.setContentMetadata(
		BluetoothLeAudioContentMetadata.fromRawBytes(baseLevel2.metaData));
		} catch (IllegalArgumentException e) {
		Log.w(TAG, "Invalid metadata, adding empty one. Error: " + e);
		subGroup.setContentMetadata(
		BluetoothLeAudioContentMetadata.fromRawBytes(new byte[0]));
		}

		metaData.addSubgroup(subGroup.build());
		}
		metaData.setSourceDevice(device, device.getAddressType());
		@@ -512,8 +534,13 @@ public class BassClientStateMachine extends StateMachine {
		if (pbData != null) {
		metaData.setPublicBroadcast(true);
		metaData.setAudioConfigQuality(pbData.getAudioConfigQuality());
		metaData.setPublicBroadcastMetadata(BluetoothLeAudioContentMetadata
		.fromRawBytes(pbData.getMetadata()));
		try {
		metaData.setPublicBroadcastMetadata(
		BluetoothLeAudioContentMetadata.fromRawBytes(pbData.getMetadata()));
		} catch (IllegalArgumentException e) {
		Log.w(TAG, "Invalid public metadata, adding empty one. Error " + e);
		metaData.setPublicBroadcastMetadata(null);
		}
		}

		String broadcastName = result.getBroadcastName();