commit b6cf963be912f91b25c6967c1c10a28996809c38
author Jakub Pawlowski <jpawlowski@google.com> Sat Oct 09 07:05:09 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 09 07:05:09 2021 +0000
tree dc0d988046e62347ff5d17049ae99c7faf44b30a
parent bbed69281062cc31e8d9fafbbdaee33620cfb3dc
parent 9a745d0f013decfa00e1cc01ccb35f946c7c1894

Merge changes I7782f95c,I7e553bd9

* changes:
  leaudio: Fix link to intent
  leaudio: update UUID

core/java/android/bluetooth/BluetoothLeAudio.java

diff --git a/core/java/android/bluetooth/BluetoothLeAudio.java b/core/java/android/bluetooth/BluetoothLeAudio.java
index 3ea865b..4161700 100644
--- a/core/java/android/bluetooth/BluetoothLeAudio.java
+++ b/core/java/android/bluetooth/BluetoothLeAudio.java
@@ -433,7 +433,7 @@
      * <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

diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java
index 67b7252..325a771 100644
--- a/core/java/android/bluetooth/BluetoothUuid.java
+++ b/core/java/android/bluetooth/BluetoothUuid.java
@@ -155,12 +155,11 @@
     @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