summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jakub Pawlowski <jpawlowski@google.com> 2020-12-15 22:12:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-15 22:12:21 +0000
commit14b8b7fca29224dc00eb97ee87a3912c9678c11e (patch)
tree1edec7173e7a8e9a8b49e84dcda45abd6d84cbda
parentd4745bc1032c77a313b51cbb043a083e5e6fc57d (diff)
parentb253796204b7ff4900a52b0fbd12790c8fc328f1 (diff)
Merge "Add LE Audio UUID placeholder" am: eec09803da am: b253796204
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513324 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0461b86760f5c26bf066799b8bf6452ac2162704
-rw-r--r--core/api/system-current.txt1
-rw-r--r--core/java/android/bluetooth/BluetoothUuid.java7
2 files changed, 7 insertions, 1 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index b982dd745672..3b3170f6f278 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -1577,6 +1577,7 @@ package android.bluetooth {
field @NonNull public static final android.os.ParcelUuid HOGP;
field @NonNull public static final android.os.ParcelUuid HSP;
field @NonNull public static final android.os.ParcelUuid HSP_AG;
+ field @NonNull public static final android.os.ParcelUuid LE_AUDIO;
field @NonNull public static final android.os.ParcelUuid MAP;
field @NonNull public static final android.os.ParcelUuid MAS;
field @NonNull public static final android.os.ParcelUuid MNS;
diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java
index e274af1b5c5d..56c482471003 100644
--- a/core/java/android/bluetooth/BluetoothUuid.java
+++ b/core/java/android/bluetooth/BluetoothUuid.java
@@ -153,7 +153,12 @@ public final class BluetoothUuid {
@SystemApi
public static final ParcelUuid HEARING_AID =
ParcelUuid.fromString("0000FDF0-0000-1000-8000-00805f9b34fb");
-
+ /** Placeholder until specification is released
+ * @hide */
+ @NonNull
+ @SystemApi
+ public static final ParcelUuid LE_AUDIO =
+ ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE");
/** @hide */
@NonNull
@SystemApi