diff options
| author | 2021-02-08 20:53:22 +0000 | |
|---|---|---|
| committer | 2021-02-08 20:53:22 +0000 | |
| commit | a42efdda60e651e7046985d7175fa2aef431920e (patch) | |
| tree | 9f4ec93a1efaae6f1f4b620458306cabe6c4f685 | |
| parent | 94404471dff3be5daa5c90b5d5023aea006c271e (diff) | |
| parent | de206f8adab6e8cfd5aaefffd28baf6552bd020b (diff) | |
Merge "Add Volume Control UUID" am: c50447ad57 am: de206f8ada
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549914
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie29ebf878b030e8c18c08ceb545ea8e1b4a3026f
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothUuid.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index fa712ba85778..5fb898a282a8 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1613,6 +1613,7 @@ package android.bluetooth { field public static final int UUID_BYTES_128_BIT = 16; // 0x10 field public static final int UUID_BYTES_16_BIT = 2; // 0x2 field public static final int UUID_BYTES_32_BIT = 4; // 0x4 + field @NonNull public static final android.os.ParcelUuid VOLUME_CONTROL; } public final class BufferConstraint implements android.os.Parcelable { diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index c0736a6b7bba..d82cf19e8822 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -167,6 +167,11 @@ public final class BluetoothUuid { /** @hide */ @NonNull @SystemApi + public static final ParcelUuid VOLUME_CONTROL = + ParcelUuid.fromString("00001844-0000-1000-8000-00805F9B34FB"); + /** @hide */ + @NonNull + @SystemApi public static final ParcelUuid BASE_UUID = ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB"); |