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

Commit 04c4cc37 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: Add Broadcast Assistant UUID" am: 85ee0fed am: 160b8eb8 am: fed908a0 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1985348

Change-Id: I97f3e0c24dc965135b9ee1f8f6b72d55f0cf27eb
parents c06e7276 fed908a0

framework/api/system-current.txt

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

    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 BASS;

    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;

framework/java/android/bluetooth/BluetoothUuid.java

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

    @NonNull

    @SystemApi

    public static final ParcelUuid BASS =

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

    /** @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid BASE_UUID =

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