Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 am: b77335b8fc am: 6f82402e5c am: 1351cc0cc4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322

Change-Id: I7ed2f59927cf428e4ed2f8b527cb41cec8759a60
This commit is contained in:
Jakub Pawlowski
2021-10-13 23:04:07 +00:00
committed by Automerger Merge Worker
parent 24a011273a 1351cc0cc4
commit f4a361baca
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -2129,6 +2129,7 @@ package android.bluetooth {
field @NonNull public static final android.os.ParcelUuid AVRCP_TARGET; 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 BASE_UUID;
field @NonNull public static final android.os.ParcelUuid BNEP; 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 COORDINATED_SET;
field @NonNull public static final android.os.ParcelUuid DIP; field @NonNull public static final android.os.ParcelUuid DIP;
field @NonNull public static final android.os.ParcelUuid GENERIC_MEDIA_CONTROL; field @NonNull public static final android.os.ParcelUuid GENERIC_MEDIA_CONTROL;

5
core/java/android/bluetooth/BluetoothUuid.java
View File

@@ -188,6 +188,11 @@ public final class BluetoothUuid {
/** @hide */ /** @hide */
@NonNull @NonNull
@SystemApi @SystemApi
public static final ParcelUuid CAP =
ParcelUuid.fromString("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE");
/** @hide */
@NonNull
@SystemApi
public static final ParcelUuid BASE_UUID = public static final ParcelUuid BASE_UUID =
ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB"); ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB");