Snap for 8432030 from 80f324b555f994457e02d5335d809148f5502b99 to tm-qpr1-release (7df8cd2f) · Commits · e / os / android_packages_modules_Bluetooth

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

+146 −111

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ import com.android.bluetooth.btservice.ServiceFactory;
		import com.android.bluetooth.btservice.storage.DatabaseManager;
		import com.android.bluetooth.mcp.McpService;
		import com.android.bluetooth.vc.VolumeControlService;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.modules.utils.SynchronousResultReceiver;

		@@ -110,9 +111,10 @@ public class LeAudioService extends ProfileService {
		private AdapterService mAdapterService;
		private DatabaseManager mDatabaseManager;
		private HandlerThread mStateMachinesThread;
		private BluetoothDevice mActiveAudioOutDevice;
		private BluetoothDevice mActiveAudioInDevice;
		private volatile BluetoothDevice mActiveAudioOutDevice;
		private volatile BluetoothDevice mActiveAudioInDevice;
		private LeAudioCodecConfig mLeAudioCodecConfig;
		private Object mGroupLock = new Object();
		ServiceFactory mServiceFactory = new ServiceFactory();

		LeAudioNativeInterface mLeAudioNativeInterface;
		@@ -143,9 +145,11 @@ public class LeAudioService extends ProfileService {
		List<BluetoothLeAudioCodecConfig> mInputLocalCodecCapabilities = new ArrayList<>();
		List<BluetoothLeAudioCodecConfig> mOutputLocalCodecCapabilities = new ArrayList<>();

		@GuardedBy("mGroupLock")
		private final Map<Integer, LeAudioGroupDescriptor> mGroupDescriptors = new LinkedHashMap<>();
		private final Map<BluetoothDevice, LeAudioStateMachine> mStateMachines = new LinkedHashMap<>();

		@GuardedBy("mGroupLock")
		private final Map<BluetoothDevice, Integer> mDeviceGroupIdMap = new ConcurrentHashMap<>();
		private final Map<BluetoothDevice, Integer> mDeviceAudioLocationMap = new ConcurrentHashMap<>();

		@@ -210,13 +214,15 @@ public class LeAudioService extends ProfileService {
		mStateMachinesThread = new HandlerThread("LeAudioService.StateMachines");
		mStateMachinesThread.start();

		mDeviceGroupIdMap.clear();
		mDeviceAudioLocationMap.clear();
		mBroadcastStateMap.clear();
		mBroadcastMetadataList.clear();
		mBroadcastsPlaybackMap.clear();

		synchronized (mGroupLock) {
		mDeviceGroupIdMap.clear();
		mGroupDescriptors.clear();
		}

		// Setup broadcast receivers
		IntentFilter filter = new IntentFilter();
		@@ -247,12 +253,19 @@ public class LeAudioService extends ProfileService {

		// Delay the call to init by posting it. This ensures TBS and MCS are fully initialized
		// before we start accepting connections
		mHandler.post(() ->
		mLeAudioNativeInterface.init(mLeAudioCodecConfig.getCodecConfigOffloading()));
		mHandler.post(this::init);

		return true;
		}

		private void init() {
		LeAudioNativeInterface nativeInterface = mLeAudioNativeInterface;
		if (nativeInterface == null) {
		Log.w(TAG, "the service is stopped. ignore init()");
		}
		nativeInterface.init(mLeAudioCodecConfig.getCodecConfigOffloading());
		}

		@Override
		protected boolean stop() {
		Log.i(TAG, "stop()");
		@@ -264,6 +277,7 @@ public class LeAudioService extends ProfileService {
		setActiveDevice(null);
		//Don't wait for async call with INACTIVE group status, clean active
		//device for active group.
		synchronized (mGroupLock) {
		for (Map.Entry<Integer, LeAudioGroupDescriptor> entry : mGroupDescriptors.entrySet()) {
		LeAudioGroupDescriptor descriptor = entry.getValue();
		Integer group_id = entry.getKey();
		@@ -274,6 +288,9 @@ public class LeAudioService extends ProfileService {
		break;
		}
		}
		mDeviceGroupIdMap.clear();
		mGroupDescriptors.clear();
		}

		// Cleanup native interfaces
		mLeAudioNativeInterface.cleanup();
		@@ -297,9 +314,7 @@ public class LeAudioService extends ProfileService {
		mStateMachines.clear();
		}

		mDeviceGroupIdMap.clear();
		mDeviceAudioLocationMap.clear();
		mGroupDescriptors.clear();

		if (mBroadcastCallbacks != null) {
		mBroadcastCallbacks.kill();
		@@ -328,7 +343,6 @@ public class LeAudioService extends ProfileService {
		}
		}

		mAudioManager = null;
		mAdapterService = null;
		mAudioManager = null;

		@@ -423,7 +437,7 @@ public class LeAudioService extends ProfileService {
		}
		}

		public BluetoothDevice getConnectedGroupLeadDevice(int groupId) {
		BluetoothDevice getConnectedGroupLeadDevice(int groupId) {
		return getFirstDeviceFromGroup(groupId);
		}

		@@ -499,7 +513,7 @@ public class LeAudioService extends ProfileService {
		* @param device the active device
		* @return true on success, otherwise false
		*/
		public boolean groupAddNode(int groupId, BluetoothDevice device) {
		boolean groupAddNode(int groupId, BluetoothDevice device) {
		return mLeAudioNativeInterface.groupAddNode(groupId, device);
		}

		@@ -509,7 +523,7 @@ public class LeAudioService extends ProfileService {
		* @param device the active device
		* @return true on success, otherwise false
		*/
		public boolean groupRemoveNode(int groupId, BluetoothDevice device) {
		boolean groupRemoveNode(int groupId, BluetoothDevice device) {
		return mLeAudioNativeInterface.groupRemoveNode(groupId, device);
		}

		@@ -519,23 +533,25 @@ public class LeAudioService extends ProfileService {
		* @return true given group exists, otherwise false
		*/
		public boolean isValidDeviceGroup(int group_id) {
		return (group_id != LE_AUDIO_GROUP_ID_INVALID) ?
		mDeviceGroupIdMap.containsValue(group_id) :
		false;
		return group_id != LE_AUDIO_GROUP_ID_INVALID && mDeviceGroupIdMap.containsValue(group_id);
		}

		/**
		* Get all the devices within a given group.
		* @param group_id group Id to verify
		* @param groupId group id to get devices
		* @return all devices within a given group or empty list
		*/
		public List<BluetoothDevice> getGroupDevices(int group_id) {
		public List<BluetoothDevice> getGroupDevices(int groupId) {
		List<BluetoothDevice> result = new ArrayList<>();

		if (group_id != LE_AUDIO_GROUP_ID_INVALID) {
		for (BluetoothDevice storedDevice : mDeviceGroupIdMap.keySet()) {
		if (getGroupId(storedDevice) == group_id) {
		result.add(storedDevice);
		if (groupId == LE_AUDIO_GROUP_ID_INVALID) {
		return result;
		}

		synchronized (mGroupLock) {
		for (Map.Entry<BluetoothDevice, Integer> entry : mDeviceGroupIdMap.entrySet()) {
		if (entry.getValue() == groupId) {
		result.add(entry.getKey());
		}
		}
		}
		@@ -545,11 +561,11 @@ public class LeAudioService extends ProfileService {
		/**
		* Get supported group audio direction from available context.
		*
		* @param activeContext bitset of active context to be matched with possible audio direction
		* @param activeContexts bitset of active context to be matched with possible audio direction
		* support.
		* @return matched possible audio direction support masked bitset
		* {@link AUDIO_DIRECTION_INPUT_BIT} if input audio is supported
		* {@link AUDIO_DIRECTION_OUTPUT_BIT} if output audio is supported
		* {@link #AUDIO_DIRECTION_INPUT_BIT} if input audio is supported
		* {@link #AUDIO_DIRECTION_OUTPUT_BIT} if output audio is supported
		*/
		private Integer getAudioDirectionsFromActiveContextsMap(Integer activeContexts) {
		Integer supportedAudioDirections = 0;
		@@ -565,12 +581,14 @@ public class LeAudioService extends ProfileService {
		}

		private Integer getActiveGroupId() {
		synchronized (mGroupLock) {
		for (Map.Entry<Integer, LeAudioGroupDescriptor> entry : mGroupDescriptors.entrySet()) {
		LeAudioGroupDescriptor descriptor = entry.getValue();
		if (descriptor.mIsActive) {
		return entry.getKey();
		}
		}
		}
		return LE_AUDIO_GROUP_ID_INVALID;
		}

		@@ -669,21 +687,21 @@ public class LeAudioService extends ProfileService {
		}

		private BluetoothDevice getFirstDeviceFromGroup(Integer groupId) {
		if (groupId != LE_AUDIO_GROUP_ID_INVALID) {
		if (groupId == LE_AUDIO_GROUP_ID_INVALID) {
		return null;
		}
		synchronized (mGroupLock) {
		for (Map.Entry<BluetoothDevice, Integer> entry : mDeviceGroupIdMap.entrySet()) {
		if (entry.getValue() != groupId) {
		continue;
		}

		LeAudioStateMachine sm = mStateMachines.get(entry.getKey());
		if (sm == null \|\| sm.getConnectionState() != BluetoothProfile.STATE_CONNECTED) {
		continue;
		}

		return entry.getKey();
		}
		}

		return null;
		}

		@@ -720,10 +738,12 @@ public class LeAudioService extends ProfileService {
		}
		} else if (previousGroupId != LE_AUDIO_GROUP_ID_INVALID) {
		/* Mark old group as no active */
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(previousGroupId);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(previousGroupId);
		if (descriptor != null) {
		descriptor.mIsActive = false;
		}
		}
		}

		BluetoothDevice previousInDevice = mActiveAudioInDevice;

		@@ -784,10 +804,12 @@ public class LeAudioService extends ProfileService {
		} else if (previousGroupId != LE_AUDIO_GROUP_ID_INVALID) {
		Log.i(TAG, " Switching active group from " + previousGroupId + " to " + groupId);
		/* Mark old group as no active */
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(previousGroupId);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(previousGroupId);
		if (descriptor != null) {
		descriptor.mIsActive = false;
		}
		}
		}

		BluetoothDevice previousOutDevice = mActiveAudioOutDevice;

		@@ -851,9 +873,8 @@ public class LeAudioService extends ProfileService {

		/**
		* Set the active device group.
		* @param groupId group Id to set active
		*/
		private void setActiveDeviceGroup(BluetoothDevice device) {
		private void setActiveGroupWithDevice(BluetoothDevice device) {
		int groupId = LE_AUDIO_GROUP_ID_INVALID;

		if (device != null) {
		@@ -862,9 +883,9 @@ public class LeAudioService extends ProfileService {

		int currentlyActiveGroupId = getActiveGroupId();
		if (DBG) {
		Log.d(TAG, "setActiveDeviceGroup = " + groupId +
		", currentlyActiveGroupId = " + currentlyActiveGroupId +
		", device: " + device);
		Log.d(TAG, "setActiveGroupWithDevice = " + groupId
		+ ", currentlyActiveGroupId = " + currentlyActiveGroupId
		+ ", device: " + device);
		}

		if (groupId == currentlyActiveGroupId) {
		@@ -882,24 +903,22 @@ public class LeAudioService extends ProfileService {
		* @return true on success, otherwise false
		*/
		public boolean setActiveDevice(BluetoothDevice device) {
		synchronized (mStateMachines) {
		/* Clear active group */
		if (device == null) {
		setActiveDeviceGroup(device);
		setActiveGroupWithDevice(device);
		return true;
		}
		if (getConnectionState(device) != BluetoothProfile.STATE_CONNECTED) {
		Log.e(TAG, "setActiveDevice(" + device + "): failed because group device is not " +
		"connected");
		Log.e(TAG, "setActiveDevice(" + device + "): failed because group device is not "
		+ "connected");
		return false;
		}
		setActiveDeviceGroup(device);
		setActiveGroupWithDevice(device);
		return true;
		}
		}

		/**
		* Get the active LE audio device.
		* Get the active LE audio devices.
		*
		* Note: When LE audio group is active, one of the Bluetooth device address
		* which belongs to the group, represents the active LE audio group.
		@@ -912,17 +931,16 @@ public class LeAudioService extends ProfileService {
		if (DBG) {
		Log.d(TAG, "getActiveDevices");
		}
		ArrayList<BluetoothDevice> activeDevices = new ArrayList<>();
		ArrayList<BluetoothDevice> activeDevices = new ArrayList<>(2);
		activeDevices.add(null);
		activeDevices.add(null);
		synchronized (mStateMachines) {

		int currentlyActiveGroupId = getActiveGroupId();
		if (currentlyActiveGroupId == LE_AUDIO_GROUP_ID_INVALID) {
		return activeDevices;
		}
		activeDevices.add(0, mActiveAudioOutDevice);
		activeDevices.add(1, mActiveAudioInDevice);
		}
		activeDevices.set(0, mActiveAudioOutDevice);
		activeDevices.set(1, mActiveAudioInDevice);
		return activeDevices;
		}

		@@ -959,7 +977,6 @@ public class LeAudioService extends ProfileService {
		sm.sendMessage(LeAudioStateMachine.CONNECT);
		}
		}

		}

		// Suppressed since this is part of a local process
		@@ -995,27 +1012,18 @@ public class LeAudioService extends ProfileService {
		return;
		}
		} else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_GROUP_NODE_STATUS_CHANGED) {
		int group_id = stackEvent.valueInt1;
		int node_status = stackEvent.valueInt2;
		int groupId = stackEvent.valueInt1;
		int nodeStatus = stackEvent.valueInt2;

		Objects.requireNonNull(stackEvent.device,
		"Device should never be null, event: " + stackEvent);

		switch (node_status) {
		switch (nodeStatus) {
		case LeAudioStackEvent.GROUP_NODE_ADDED:
		mDeviceGroupIdMap.put(device, group_id);
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(group_id);
		if (descriptor == null) {
		mGroupDescriptors.put(group_id, new LeAudioGroupDescriptor());
		}
		notifyGroupNodeAdded(device, group_id);
		handleGroupNodeAdded(device, groupId);
		break;
		case LeAudioStackEvent.GROUP_NODE_REMOVED:
		mDeviceGroupIdMap.remove(device);
		if (mDeviceGroupIdMap.containsValue(group_id) == false) {
		mGroupDescriptors.remove(group_id);
		}
		notifyGroupNodeRemoved(device, group_id);
		handleGroupNodeRemoved(device, groupId);
		break;
		default:
		break;
		@@ -1027,7 +1035,7 @@ public class LeAudioService extends ProfileService {
		} else if (stackEvent.type
		== LeAudioStackEvent.EVENT_TYPE_AUDIO_GROUP_CODEC_CONFIG_CHANGED) {
		int groupId = stackEvent.valueInt1;
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(groupId);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);
		if (descriptor == null) {
		Log.e(TAG, " Group not found " + groupId);
		return;
		@@ -1050,27 +1058,26 @@ public class LeAudioService extends ProfileService {

		descriptor.mCodecStatus = status;
		notifyUnicastCodecConfigChanged(groupId, status);

		} else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_AUDIO_CONF_CHANGED) {
		int direction = stackEvent.valueInt1;
		int group_id = stackEvent.valueInt2;
		int groupId = stackEvent.valueInt2;
		int snk_audio_location = stackEvent.valueInt3;
		int src_audio_location = stackEvent.valueInt4;
		int available_contexts = stackEvent.valueInt5;

		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(group_id);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);
		if (descriptor != null) {
		if (descriptor.mIsActive) {
		descriptor.mIsActive =
		updateActiveDevices(group_id, descriptor.mActiveContexts,
		updateActiveDevices(groupId, descriptor.mActiveContexts,
		available_contexts, descriptor.mIsActive);
		if (!descriptor.mIsActive) {
		notifyGroupStatusChanged(group_id, BluetoothLeAudio.GROUP_STATUS_INACTIVE);
		notifyGroupStatusChanged(groupId, BluetoothLeAudio.GROUP_STATUS_INACTIVE);
		}
		}
		descriptor.mActiveContexts = available_contexts;
		} else {
		Log.e(TAG, "no descriptors for group: " + group_id);
		Log.e(TAG, "no descriptors for group: " + groupId);
		}
		} else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_SINK_AUDIO_LOCATION_AVAILABLE) {
		Objects.requireNonNull(stackEvent.device,
		@@ -1084,36 +1091,36 @@ public class LeAudioService extends ProfileService {
		+ " audio location:" + sink_audio_location);
		}
		} else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_GROUP_STATUS_CHANGED) {
		int group_id = stackEvent.valueInt1;
		int group_status = stackEvent.valueInt2;
		int groupId = stackEvent.valueInt1;
		int groupStatus = stackEvent.valueInt2;
		boolean notifyGroupStatus = false;

		switch (group_status) {
		switch (groupStatus) {
		case LeAudioStackEvent.GROUP_STATUS_ACTIVE: {
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(group_id);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);
		if (descriptor != null) {
		if (!descriptor.mIsActive) {
		descriptor.mIsActive = updateActiveDevices(group_id,
		descriptor.mIsActive = updateActiveDevices(groupId,
		ACTIVE_CONTEXTS_NONE,
		descriptor.mActiveContexts, true);
		notifyGroupStatus = descriptor.mIsActive;
		}
		} else {
		Log.e(TAG, "no descriptors for group: " + group_id);
		Log.e(TAG, "no descriptors for group: " + groupId);
		}
		break;
		}
		case LeAudioStackEvent.GROUP_STATUS_INACTIVE: {
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(group_id);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);
		if (descriptor != null) {
		if (descriptor.mIsActive) {
		descriptor.mIsActive = false;
		updateActiveDevices(group_id, descriptor.mActiveContexts,
		updateActiveDevices(groupId, descriptor.mActiveContexts,
		ACTIVE_CONTEXTS_NONE, descriptor.mIsActive);
		notifyGroupStatus = true;
		}
		} else {
		Log.e(TAG, "no descriptors for group: " + group_id);
		Log.e(TAG, "no descriptors for group: " + groupId);
		}
		break;
		}
		@@ -1122,7 +1129,7 @@ public class LeAudioService extends ProfileService {
		}

		if (notifyGroupStatus) {
		notifyGroupStatusChanged(group_id, group_status);
		notifyGroupStatusChanged(groupId, groupStatus);
		}

		} else if (stackEvent.type == LeAudioStackEvent.EVENT_TYPE_BROADCAST_CREATED) {
		@@ -1340,7 +1347,7 @@ public class LeAudioService extends ProfileService {
		// BluetoothMetricsProto.ProfileId.LE_AUDIO);
		}

		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(myGroupId);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(myGroupId);
		if (descriptor != null) {
		descriptor.mIsConnected = true;
		/* HearingAid activates device after connection
		@@ -1372,7 +1379,7 @@ public class LeAudioService extends ProfileService {
		}

		int myGroupId = getGroupId(device);
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(myGroupId);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(myGroupId);
		if (descriptor == null) {
		Log.e(TAG, "no descriptors for group: " + myGroupId);
		return;
		@@ -1520,8 +1527,10 @@ public class LeAudioService extends ProfileService {
		if (device == null) {
		return LE_AUDIO_GROUP_ID_INVALID;
		}
		synchronized (mGroupLock) {
		return mDeviceGroupIdMap.getOrDefault(device, LE_AUDIO_GROUP_ID_INVALID);
		}
		}

		/**
		* Set volume for streaming devices
		@@ -1544,6 +1553,23 @@ public class LeAudioService extends ProfileService {
		}
		}

		private LeAudioGroupDescriptor getGroupDescriptor(int groupId) {
		synchronized (mGroupLock) {
		return mGroupDescriptors.get(groupId);
		}
		}

		private void handleGroupNodeAdded(BluetoothDevice device, int groupId) {
		synchronized (mGroupLock) {
		mDeviceGroupIdMap.put(device, groupId);
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(groupId);
		if (descriptor == null) {
		mGroupDescriptors.put(groupId, new LeAudioGroupDescriptor());
		}
		notifyGroupNodeAdded(device, groupId);
		}
		}

		private void notifyGroupNodeAdded(BluetoothDevice device, int groupId) {
		if (mLeAudioCallbacks != null) {
		int n = mLeAudioCallbacks.beginBroadcast();
		@@ -1558,6 +1584,16 @@ public class LeAudioService extends ProfileService {
		}
		}

		private void handleGroupNodeRemoved(BluetoothDevice device, int groupId) {
		synchronized (mGroupLock) {
		mDeviceGroupIdMap.remove(device);
		if (!mDeviceGroupIdMap.containsValue(groupId)) {
		mGroupDescriptors.remove(groupId);
		}
		notifyGroupNodeRemoved(device, groupId);
		}
		}

		private void notifyGroupNodeRemoved(BluetoothDevice device, int groupId) {
		if (mLeAudioCallbacks != null) {
		int n = mLeAudioCallbacks.beginBroadcast();
		@@ -1741,7 +1777,7 @@ public class LeAudioService extends ProfileService {
		if (DBG) {
		Log.d(TAG, "getCodecStatus(" + groupId + ")");
		}
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(groupId);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);
		if (descriptor != null) {
		return descriptor.mCodecStatus;
		}
		@@ -1764,7 +1800,7 @@ public class LeAudioService extends ProfileService {
		+ Objects.toString(inputCodecConfig)
		+ Objects.toString(outputCodecConfig));
		}
		LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(groupId);
		LeAudioGroupDescriptor descriptor = getGroupDescriptor(groupId);
		if (descriptor == null) {
		Log.e(TAG, "setCodecConfigPreference: Invalid groupId, " + groupId);
		return;
		@@ -1793,7 +1829,6 @@ public class LeAudioService extends ProfileService {
		inputCodecConfig, outputCodecConfig);
		}


		/**
		* Binder object: must be a static class or memory leak may occur
		*/

android/leaudio/app/src/main/AndroidManifest.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,11 @@
		android:excludeFromRecents="true"
		android:theme="@style/AppTheme.NoActionBar">
		</activity>
		<activity
		android:name=".BroadcastScanActivity"
		android:excludeFromRecents="true"
		android:theme="@style/AppTheme.NoActionBar">
		</activity>
		</application>

		</manifest>

android/leaudio/app/src/main/java/com/android/bluetooth/leaudio/BluetoothProxy.java

+302 −5

File changed.

Preview size limit exceeded, changes collapsed.

android/leaudio/app/src/main/java/com/android/bluetooth/leaudio/BroadcastItemsAdapter.java

+28 −16

Original line number	Diff line number	Diff line
		@@ -34,12 +34,10 @@ import java.util.HashMap;
		import java.util.List;
		import java.util.Map;

		import com.android.bluetooth.leaudio.R;

		public class BroadcastItemsAdapter
		extends RecyclerView.Adapter<BroadcastItemsAdapter.BroadcastItemHolder> {
		private List<BluetoothLeBroadcastMetadata> mBroadcastMetadata = new ArrayList<>();
		private final Map<Integer /* broadcastId /, Boolean / isPlaying */> mBroadcastPlayback =
		private List<BluetoothLeBroadcastMetadata> mBroadcastMetadataList = new ArrayList<>();
		private final Map<Integer /* broadcastId /, Boolean / isPlaying */> mBroadcastPlaybackMap =
		new HashMap<>();
		private OnItemClickListener mOnItemClickListener;

		@@ -57,8 +55,8 @@ public class BroadcastItemsAdapter

		@Override
		public void onBindViewHolder(@NonNull BroadcastItemHolder holder, int position) {
		Integer broadcastId = (Integer) mBroadcastPlayback.keySet().toArray()[position];
		Boolean isPlaying = mBroadcastPlayback.get(broadcastId);
		Integer broadcastId = (Integer) mBroadcastPlaybackMap.keySet().toArray()[position];
		Boolean isPlaying = mBroadcastPlaybackMap.get(broadcastId);

		// Set card color based on the playback state
		if (isPlaying) {
		@@ -76,33 +74,47 @@ public class BroadcastItemsAdapter

		@Override
		public int getItemCount() {
		return mBroadcastPlayback.size();
		return mBroadcastPlaybackMap.size();
		}

		public void updateBroadcastsMetadata(List<BluetoothLeBroadcastMetadata> broadcasts) {
		mBroadcastMetadata = broadcasts;
		mBroadcastMetadataList = broadcasts;
		notifyDataSetChanged();
		}

		public void updateBroadcastMetadata(BluetoothLeBroadcastMetadata broadcast) {
		mBroadcastMetadata.removeIf(bc -> (bc.getBroadcastId() == broadcast.getBroadcastId()));
		mBroadcastMetadata.add(broadcast);
		mBroadcastMetadataList.removeIf(bc -> (bc.getBroadcastId() == broadcast.getBroadcastId()));
		mBroadcastMetadataList.add(broadcast);
		notifyDataSetChanged();
		}

		public void addBroadcasts(Integer broadcastId) {
		if (!mBroadcastPlayback.containsKey(broadcastId))
		mBroadcastPlayback.put(broadcastId, false);
		if (!mBroadcastPlaybackMap.containsKey(broadcastId))
		mBroadcastPlaybackMap.put(broadcastId, false);
		}

		public void removeBroadcast(Integer broadcastId) {
		mBroadcastMetadata.removeIf(bc -> (broadcastId.equals(bc.getBroadcastId())));
		mBroadcastPlayback.remove(broadcastId);
		mBroadcastMetadataList.removeIf(bc -> (broadcastId.equals(bc.getBroadcastId())));
		mBroadcastPlaybackMap.remove(broadcastId);
		notifyDataSetChanged();
		}

		public void setBroadcasts(List<BluetoothLeBroadcastMetadata> broadcasts) {
		mBroadcastMetadataList.clear();
		mBroadcastMetadataList.addAll(broadcasts);

		for (BluetoothLeBroadcastMetadata b : broadcasts) {
		int broadcastId = b.getBroadcastId();
		if (mBroadcastPlaybackMap.containsKey(broadcastId)) {
		continue;
		}
		mBroadcastPlaybackMap.remove(broadcastId);
		}
		notifyDataSetChanged();
		}

		public void updateBroadcastPlayback(Integer broadcastId, boolean isPlaying) {
		mBroadcastPlayback.put(broadcastId, isPlaying);
		mBroadcastPlaybackMap.put(broadcastId, isPlaying);
		notifyDataSetChanged();
		}

		@@ -125,7 +137,7 @@ public class BroadcastItemsAdapter

		int position = getAdapterPosition();
		if (position != RecyclerView.NO_POSITION) {
		Integer broadcastId = (Integer) mBroadcastPlayback.keySet().toArray()[position];
		Integer broadcastId = (Integer) mBroadcastPlaybackMap.keySet().toArray()[position];
		listener.onItemClick(broadcastId);
		}
		});

android/leaudio/app/src/main/java/com/android/bluetooth/leaudio/BroadcastScanActivity.java

0 → 100644

+123 −0

File added.

Preview size limit exceeded, changes collapsed.