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

Merge "Group CSIP device based on CAP"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-27 15:30:41 +00:00
committed by Android (Google) Code Review
parent 38b51af186 436bffbdf0
commit 1c22830676
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
@SystemApi
public static final ParcelUuid CAP =
ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE");
ParcelUuid.fromString("00008FE0-0000-1000-8000-00805F9B34FB");
/** @hide */
@NonNull
@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()) {
if (entry.getValue().equals(BluetoothUuid.BASE_UUID)) {
if (entry.getValue().equals(BluetoothUuid.CAP)) {
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());
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;
}