Merge "leaudio: Fix removing group descriptors" (ac42efbd) · Commits · e / os / android_packages_modules_Bluetooth

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

+7 −4

Original line number	Original line	Diff line number	Diff line
	@@ -332,8 +332,6 @@ public class LeAudioService extends ProfileService {
	}		}
	}		}

	mGroupDescriptors.remove(groupId);

	return true;		return true;
	}		}

	@@ -652,11 +650,16 @@ public class LeAudioService extends ProfileService {
	switch (node_status) {		switch (node_status) {
	case LeAudioStackEvent.GROUP_NODE_ADDED:		case LeAudioStackEvent.GROUP_NODE_ADDED:
	mDeviceGroupIdMap.put(device, group_id);		mDeviceGroupIdMap.put(device, group_id);
			LeAudioGroupDescriptor descriptor = mGroupDescriptors.get(group_id);
			if (descriptor == null) {
	mGroupDescriptors.put(group_id, new LeAudioGroupDescriptor());		mGroupDescriptors.put(group_id, new LeAudioGroupDescriptor());
			}
	break;		break;
	case LeAudioStackEvent.GROUP_NODE_REMOVED:		case LeAudioStackEvent.GROUP_NODE_REMOVED:
	mDeviceGroupIdMap.remove(device);		mDeviceGroupIdMap.remove(device);
			if (mDeviceGroupIdMap.containsKey(group_id) == false) {
	mGroupDescriptors.remove(group_id);		mGroupDescriptors.remove(group_id);
			}
	break;		break;
	default:		default:
	break;		break;