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

Commit 0a059627 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "fix Battery service and BASS doc string" into main am: 696569e0 am: 08573e84 

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



Change-Id: I7da30a66a6b40de8d484c540113e4072bf00b93e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a86738c9 08573e84

framework/java/android/bluetooth/BluetoothUuid.java

+7 −3
Original line number Diff line number Diff line
@@ -330,8 +330,7 @@ public final class BluetoothUuid { 
            ParcelUuid.fromString("00001853-0000-1000-8000-00805F9B34FB");



    /**

     * UUID corresponding to the Broadcast Audio Scan Service (also known as LE Audio Broadcast

     * Assistant).

     * UUID corresponding to the Battery Service.

     *

     * @hide

     */
@@ -339,7 +338,12 @@ public final class BluetoothUuid { 
    public static final ParcelUuid BATTERY =

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



    /** @hide */

    /**

     * UUID corresponding to the Broadcast Audio Scan Service (also known as LE Audio Broadcast

     * Assistant).

     *

     * @hide

     */

    @NonNull @SystemApi

    public static final ParcelUuid BASS =

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