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

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

Merge changes I7782f95c,I7e553bd9 am: b6cf963b am: 5e7527db am: 8f9b42c0... 

Merge changes I7782f95c,I7e553bd9 am: b6cf963b am: 5e7527db am: 8f9b42c0 am: cb33049f am: d9fdcfef

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

Change-Id: Ie1ebbd3a1cc22f6dc2f31baf5352b75c344b9e8a
parents 9afb7297 d9fdcfef

core/java/android/bluetooth/BluetoothLeAudio.java

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ public final class BluetoothLeAudio implements BluetoothProfile, AutoCloseable { 
     * <p> This API returns false in scenarios like the profile on the

     * device is not connected or Bluetooth is not turned on.

     * When this API returns true, it is guaranteed that the

     * {@link #ACTION_LEAUDIO_ACTIVE_DEVICE_CHANGED} intent will be broadcasted

     * {@link #ACTION_LE_AUDIO_ACTIVE_DEVICE_CHANGED} intent will be broadcasted

     * with the active device.

     *

     *

core/java/android/bluetooth/BluetoothUuid.java

+2 −3
Original line number Diff line number Diff line
@@ -155,12 +155,11 @@ public final class BluetoothUuid { 
    @SystemApi

    public static final ParcelUuid HEARING_AID =

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

   /** Placeholder until specification is released

     * @hide */

    /** @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid LE_AUDIO =

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

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

    /** @hide */

    @NonNull

    @SystemApi