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

Commit 8c0ae12d authored by Alice Kuo's avatar Alice Kuo Committed by Gerrit Code Review
Browse files

Merge "Group CSIP device based on CAP"

parents ccb536b8 26bb1801

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;

                            }