diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-10 02:31:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 02:31:28 +0000 |
| commit | dcea1a5aa51efe1af73f0ebc4e727ac71be28ab9 (patch) | |
| tree | 81f28a56f0f032fc8a4c0d0a4fb64a92ee37261d /framework/java/android/bluetooth/BluetoothUuid.java | |
| parent | d2613551e1963d5bd5b9f0de5287723866bd1afb (diff) | |
| parent | 020a379b5068e9472c89bbb9f9882f3fc2dc011d (diff) | |
Merge changes Icabed06e,I25bc13c6 am: 020a379b50
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683328
Change-Id: Iccb3f39a62c0f8d34e986a12ca83e3c0b430b949
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 d82cf19e88..d07259393b 100644 --- a/framework/java/android/bluetooth/BluetoothUuid.java +++ b/framework/java/android/bluetooth/BluetoothUuid.java @@ -172,6 +172,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"); |