Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88a9f98e authored by Alice Kuo's avatar Alice Kuo Committed by Automerger Merge Worker
Browse files

Merge "Group CSIP device based on CAP" am: 8c0ae12d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934946

Change-Id: I7a2a78bccbe56785a783c514342eed312809adec
parents cc65d334 8c0ae12d

packages/SettingsLib/src/com/android/settingslib/bluetooth/CsipDeviceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

                }

            }

packages/SettingsLib/src/com/android/settingslib/bluetooth/LocalBluetoothProfileManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

                            }