Merge changes I7782f95c,I7e553bd9 am: b6cf963be9 am: 5e7527dbd5

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

Change-Id: Iecd48efe35525998123bf6548602dc9773c53c7f
This commit is contained in:
Jakub Pawlowski 2021-10-09 07:44:35 +00:00 committed by Automerger Merge Worker
commit 8f9b42c0c4
2 changed files with 3 additions and 4 deletions

View File

@ -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.
*
*

View File

@ -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