commit c50447ad570a1470f9d5bb6d5e7e450531eeb3a2
author Jakub Pawlowski <jpawlowski@google.com> Mon Feb 08 19:37:38 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 08 19:37:38 2021 +0000
tree f36e2db6947f60857421364435737e9cf27a7cff
parent 482b2dda4f888db21403b5f7047abdaf7b3ab068
parent ebb62d5d5881eeece0777bfc81769d8108996dca

Merge "Add Volume Control UUID"

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index fa712ba..5fb898a 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -1613,6 +1613,7 @@
     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 {

core/java/android/bluetooth/BluetoothUuid.java

diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java
index c0736a6..d82cf19 100644
--- a/core/java/android/bluetooth/BluetoothUuid.java
+++ b/core/java/android/bluetooth/BluetoothUuid.java
@@ -167,6 +167,11 @@
     /** @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");