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

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

Merge "Add LE Audio UUID placeholder" am: eec09803 am: b2537962 am: 14b8b7fc 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idaf4c83bbb85c8815b4988e8ba75bd7c94c2a8bd
parents 856877bf 14b8b7fc

core/api/system-current.txt

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

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

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

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

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

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

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

core/java/android/bluetooth/BluetoothUuid.java

+6 −1
Original line number Diff line number Diff line
@@ -153,7 +153,12 @@ public final class BluetoothUuid { 
    @SystemApi

    public static final ParcelUuid HEARING_AID =

            ParcelUuid.fromString("0000FDF0-0000-1000-8000-00805f9b34fb");



   /** Placeholder until specification is released

     * @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid LE_AUDIO =

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

    /** @hide */

    @NonNull

    @SystemApi