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

Group CSIP device based on CAP

Browse Source 
Enable device group based on CAP for testing, the uuid value would be changed after
the specification published.

Bug: 150670922
Bug: 178981521
Test: pair with the LE audio coordinated set, and make sure it works

Change-Id: Ia3d0dbe496dec822fee8ae6465b81688b9e9440c
This commit is contained in:
Alice Kuo
2021-10-26 21:15:13 +08:00
parent a7e52432d5
commit 436bffbdf0
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/bluetooth/BluetoothUuid.java
View File

@@ -189,7 +189,7 @@ public final class BluetoothUuid {
@NonNull @NonNull
@SystemApi @SystemApi
public static final ParcelUuid CAP = public static final ParcelUuid CAP =
ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE"); ParcelUuid.fromString("00008FE0-0000-1000-8000-00805F9B34FB");
/** @hide */ /** @hide */
@NonNull @NonNull
@SystemApi @SystemApi

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;
} }