summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alice Kuo <aliceypkuo@google.com> 2021-10-26 21:15:13 +0800
committer Alice Kuo <aliceypkuo@google.com> 2021-12-30 07:54:51 +0800
commit26bb180195a1b65c7d1cb438f8bbc06f66bb7aed (patch)
treef2f009bd5c170b8936b0adf368e5c9125102ae93
parent4f4060c7b4577797c97d020701963a0aa1e4e857 (diff)
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
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java2
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java2
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 36d9cf83120a..cc56a212aea1 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<Integer, ParcelUuid> 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 334792048105..5e2f31010900 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<Integer, ParcelUuid> entry: groupIdMap.entrySet()) {
- if (entry.getValue().equals(BluetoothUuid.BASE_UUID)) {
+ if (entry.getValue().equals(BluetoothUuid.CAP)) {
cachedDevice.setGroupId(entry.getKey());
break;
}