diff options
| author | 2021-10-13 23:11:31 +0000 | |
|---|---|---|
| committer | 2021-10-13 23:11:31 +0000 | |
| commit | de532011f4ff312ece5acb76d39330d45164f92c (patch) | |
| tree | 11293aebe99f345af7fd6daaf5279fd4bdddd113 | |
| parent | 1a8d5596eb117bcc7997b0c0744176d34489d446 (diff) | |
| parent | f4a361baca568330734020ade9aeea852f42a0da (diff) | |
Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 am: b77335b8fc am: 6f82402e5c am: 1351cc0cc4 am: f4a361baca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322
Change-Id: Iea0e156841d33af3aac63f27f8055bd021beb288
| -rwxr-xr-x | 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 007b99513c6c..29d581a95e83 100755 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -2133,6 +2133,7 @@ package android.bluetooth { field @NonNull public static final android.os.ParcelUuid AVRCP_TARGET; field @NonNull public static final android.os.ParcelUuid BASE_UUID; field @NonNull public static final android.os.ParcelUuid BNEP; + field @NonNull public static final android.os.ParcelUuid CAP; field @NonNull public static final android.os.ParcelUuid COORDINATED_SET; field @NonNull public static final android.os.ParcelUuid DIP; field @NonNull public static final android.os.ParcelUuid GENERIC_MEDIA_CONTROL; diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index 325a77107255..858819e15abc 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -188,6 +188,11 @@ public final class BluetoothUuid { /** @hide */ @NonNull @SystemApi + public static final ParcelUuid CAP = + ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE"); + /** @hide */ + @NonNull + @SystemApi public static final ParcelUuid BASE_UUID = ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB"); |