Merge "[le audio] Update mBroadcastDescriptors before notifying by callbacks" into main (c4d7f7ad) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/le_audio/LeAudioService.java

+10 −13

Original line number	Diff line number	Diff line
		@@ -2540,10 +2540,8 @@ public class LeAudioService extends ProfileService {
		boolean success = stackEvent.valueBool1;
		if (success) {
		Log.d(TAG, "Broadcast broadcastId: " + broadcastId + " created.");
		notifyBroadcastStarted(broadcastId, BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);

		mBroadcastDescriptors.put(broadcastId, new LeAudioBroadcastDescriptor());

		notifyBroadcastStarted(broadcastId, BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);
		// Start sending the actual stream
		startBroadcast(broadcastId);

		@@ -2562,23 +2560,22 @@ public class LeAudioService extends ProfileService {

		} else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_BROADCAST_DESTROYED) {
		Integer broadcastId = stackEvent.valueInt1;
		LeAudioBroadcastDescriptor descriptor = mBroadcastDescriptors.get(broadcastId);
		if (descriptor == null) {
		Log.e(
		TAG,
		"EVENT_TYPE_BROADCAST_DESTROYED: No valid descriptor for broadcastId: "
		+ broadcastId);
		} else {
		mBroadcastDescriptors.remove(broadcastId);
		}

		// TODO: Improve reason reporting or extend the native stack event with reason code
		notifyOnBroadcastStopped(broadcastId, BluetoothStatusCodes.REASON_LOCAL_APP_REQUEST);

		BassClientService bassClientService = getBassClientService();
		if (bassClientService != null) {
		bassClientService.stopReceiversSourceSynchronization(broadcastId);
		}

		LeAudioBroadcastDescriptor descriptor = mBroadcastDescriptors.get(broadcastId);
		if (descriptor == null) {
		Log.e(TAG, "EVENT_TYPE_BROADCAST_DESTROYED: No valid descriptor for broadcastId: "
		+ broadcastId);
		return;
		}
		mBroadcastDescriptors.remove(broadcastId);

		} else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_BROADCAST_STATE) {
		int broadcastId = stackEvent.valueInt1;
		int state = stackEvent.valueInt2;