diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2021-10-09 07:59:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-09 07:59:39 +0000 |
| commit | cb33049f46769765f331ca645437efca9a9b6dca (patch) | |
| tree | 6f751d6034baad4548d2507c1d619918b15fac19 /core/java | |
| parent | d8b714a0eccbda548fa64c1cfdb0e399b8881fb8 (diff) | |
| parent | 8f9b42c0c415d171ebdac3947d70f617f1ed39ab (diff) | |
Merge changes I7782f95c,I7e553bd9 am: b6cf963be9 am: 5e7527dbd5 am: 8f9b42c0c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1850200
Change-Id: I9e8471c154d2b5e029670f8f89d721ce32986ea3
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothLeAudio.java | 2 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothUuid.java | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothLeAudio.java b/core/java/android/bluetooth/BluetoothLeAudio.java index 3ea865bfd6ec..41617000805f 100644 --- a/core/java/android/bluetooth/BluetoothLeAudio.java +++ b/core/java/android/bluetooth/BluetoothLeAudio.java @@ -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. * * diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index 67b725221206..325a77107255 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -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 |