From 26bb180195a1b65c7d1cb438f8bbc06f66bb7aed 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 Bug: 150670922 Bug: 178981521 Test: pair with the LE audio coordinated set, and make sure it works Change-Id: Ia3d0dbe496dec822fee8ae6465b81688b9e9440c Merged-In: Ia3d0dbe496dec822fee8ae6465b81688b9e9440c --- .../com/android/settingslib/bluetooth/CsipDeviceManager.java | 2 +- .../settingslib/bluetooth/LocalBluetoothProfileManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java index 36d9cf83120ab..cc56a212aea1e 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; }