Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Group CSIP device based on CAP" am: 8c0ae12d46 am: 88a9f98e2b am: 190d67ddef

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934946

Change-Id: Ieec3b299eec5639ffeaa77783029f9bdce2a3c22
This commit is contained in:
Alice Kuo
2021-12-30 01:55:39 +00:00
committed by Automerger Merge Worker
parent d5b640e3b9 190d67ddef
commit 02d8bafba2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java
View File

@@ -68,7 +68,7 @@ public class CsipDeviceManager {
} }
for (Map.Entry<Integer, ParcelUuid> entry: groupIdMap.entrySet()) { for (Map.Entry<Integer, ParcelUuid> entry: groupIdMap.entrySet()) {
if (entry.getValue().equals(BluetoothUuid.BASE_UUID)) { if (entry.getValue().equals(BluetoothUuid.CAP)) {
return entry.getKey(); return entry.getKey();
} }
} }

2
packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -338,7 +338,7 @@ public class LocalBluetoothProfileManager {
.getGroupUuidMapByDevice(cachedDevice.getDevice()); .getGroupUuidMapByDevice(cachedDevice.getDevice());
if (groupIdMap != null) { if (groupIdMap != null) {
for (Map.Entry<Integer, ParcelUuid> entry: groupIdMap.entrySet()) { for (Map.Entry<Integer, ParcelUuid> entry: groupIdMap.entrySet()) {
if (entry.getValue().equals(BluetoothUuid.BASE_UUID)) { if (entry.getValue().equals(BluetoothUuid.CAP)) {
cachedDevice.setGroupId(entry.getKey()); cachedDevice.setGroupId(entry.getKey());
break; break;
} }