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

Commit 1c228306 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Group CSIP device based on CAP"

parents 38b51af1 436bffbd

core/java/android/bluetooth/BluetoothUuid.java

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

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;

                            }