diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-10 02:45:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 02:45:37 +0000 |
| commit | 80b57a511410b69f4bd5d44fb6d904c1acc8795f (patch) | |
| tree | be607ccfc9e5645f08c40261c9bbf3a84f0ae848 /framework/java/android/bluetooth/BluetoothUuid.java | |
| parent | 505104acbc6c7f6ae87c141498e720d623fc4167 (diff) | |
| parent | dcea1a5aa51efe1af73f0ebc4e727ac71be28ab9 (diff) | |
Merge changes Icabed06e,I25bc13c6 am: 020a379b50 am: dcea1a5aa5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683328
Change-Id: I50a17e3b0a1d0da3794db7704585a7d1df3af14e
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothUuid.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothUuid.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/framework/java/android/bluetooth/BluetoothUuid.java b/framework/java/android/bluetooth/BluetoothUuid.java index bc3754a2fc..ff250e63cc 100644 --- a/framework/java/android/bluetooth/BluetoothUuid.java +++ b/framework/java/android/bluetooth/BluetoothUuid.java @@ -174,6 +174,16 @@ public final class BluetoothUuid { /** @hide */ @NonNull @SystemApi + public static final ParcelUuid GENERIC_MEDIA_CONTROL = + ParcelUuid.fromString("00001849-0000-1000-8000-00805F9B34FB"); + /** @hide */ + @NonNull + @SystemApi + public static final ParcelUuid MEDIA_CONTROL = + ParcelUuid.fromString("00001848-0000-1000-8000-00805F9B34FB"); + /** @hide */ + @NonNull + @SystemApi public static final ParcelUuid BASE_UUID = ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB"); |