From 436bffbdf0f0fddec038724a7200fc3ab13b840a Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Tue, 26 Oct 2021 21:15:13 +0800 Subject: [PATCH] Group CSIP device based on CAP 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 --- core/java/android/bluetooth/BluetoothUuid.java | 2 +- .../com/android/settingslib/bluetooth/CsipDeviceManager.java | 2 +- .../settingslib/bluetooth/LocalBluetoothProfileManager.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index 858819e15abcc..bb537ddab47b4 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -189,7 +189,7 @@ public final class BluetoothUuid { @NonNull @SystemApi public static final ParcelUuid CAP = - ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE"); + ParcelUuid.fromString("00008FE0-0000-1000-8000-00805F9B34FB"); /** @hide */ @NonNull @SystemApi diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java index 1d29966838d35..ed12e83c330c8 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java @@ -68,7 +68,7 @@ public class CsipDeviceManager { } for (Map.Entry entry: groupIdMap.entrySet()) { - if (entry.getValue().equals(BluetoothUuid.BASE_UUID)) { + if (entry.getValue().equals(BluetoothUuid.CAP)) { return entry.getKey(); } } diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java index 334792048105f..5e2f310109001 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java @@ -338,7 +338,7 @@ public class LocalBluetoothProfileManager { .getGroupUuidMapByDevice(cachedDevice.getDevice()); if (groupIdMap != null) { for (Map.Entry entry: groupIdMap.entrySet()) { - if (entry.getValue().equals(BluetoothUuid.BASE_UUID)) { + if (entry.getValue().equals(BluetoothUuid.CAP)) { cachedDevice.setGroupId(entry.getKey()); break; }