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

Commit de532011 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc5 am:... 

Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc5 am: b77335b8 am: 6f82402e am: 1351cc0c am: f4a361ba

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

Change-Id: Iea0e156841d33af3aac63f27f8055bd021beb288
parents 1a8d5596 f4a361ba

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2133,6 +2133,7 @@ package android.bluetooth { 
    field @NonNull public static final android.os.ParcelUuid AVRCP_TARGET;

    field @NonNull public static final android.os.ParcelUuid BASE_UUID;

    field @NonNull public static final android.os.ParcelUuid BNEP;

    field @NonNull public static final android.os.ParcelUuid CAP;

    field @NonNull public static final android.os.ParcelUuid COORDINATED_SET;

    field @NonNull public static final android.os.ParcelUuid DIP;

    field @NonNull public static final android.os.ParcelUuid GENERIC_MEDIA_CONTROL;

core/java/android/bluetooth/BluetoothUuid.java

+5 −0
Original line number Diff line number Diff line
@@ -188,6 +188,11 @@ public final class BluetoothUuid { 
    /** @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid CAP =

        ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE");

    /** @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid BASE_UUID =

            ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB");