diff options
| author | 2021-08-30 20:56:25 +0000 | |
|---|---|---|
| committer | 2021-08-30 20:56:25 +0000 | |
| commit | 54beaf2012d4772d603a08bbbc0863eedb6632dd (patch) | |
| tree | 878f2d18643dd724893a75fc732462b716969d62 | |
| parent | ada5fb65b5f4ae51fb81f24847a8837037503893 (diff) | |
| parent | c1b80e05e8df7210d2a5e141a3916dd3bcb9a923 (diff) | |
Merge "csip: Add constants for the Coordinated Set Identification Profile"
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothProfile.java | 8 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothUuid.java | 5 |
4 files changed, 14 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 19c59a34042b..bc61d15f4eb0 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -9083,6 +9083,7 @@ package android.bluetooth { method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public int getConnectionState(android.bluetooth.BluetoothDevice); method @RequiresPermission(android.Manifest.permission.BLUETOOTH) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]); field public static final int A2DP = 2; // 0x2 + field public static final int CSIP_SET_COORDINATOR = 25; // 0x19 field public static final String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE"; field public static final String EXTRA_STATE = "android.bluetooth.profile.extra.STATE"; field public static final int GATT = 7; // 0x7 diff --git a/core/api/system-current.txt b/core/api/system-current.txt index a0e614689345..385c4079c750 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1644,6 +1644,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 COORDINATED_SET; 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 HEARING_AID; diff --git a/core/java/android/bluetooth/BluetoothProfile.java b/core/java/android/bluetooth/BluetoothProfile.java index bea32abd06cd..c4649b4276f8 100644 --- a/core/java/android/bluetooth/BluetoothProfile.java +++ b/core/java/android/bluetooth/BluetoothProfile.java @@ -229,12 +229,18 @@ public interface BluetoothProfile { int MCP_SERVER = 24; /** + * Coordinated Set Identification Profile set coordinator + * + */ + int CSIP_SET_COORDINATOR = 25; + + /** * Max profile ID. This value should be updated whenever a new profile is added to match * the largest value assigned to a profile. * * @hide */ - int MAX_PROFILE_ID = 24; + int MAX_PROFILE_ID = 25; /** * Default priority for devices that we try to auto-connect to and diff --git a/core/java/android/bluetooth/BluetoothUuid.java b/core/java/android/bluetooth/BluetoothUuid.java index d07259393b51..7e4ee9e84693 100644 --- a/core/java/android/bluetooth/BluetoothUuid.java +++ b/core/java/android/bluetooth/BluetoothUuid.java @@ -182,6 +182,11 @@ public final class BluetoothUuid { /** @hide */ @NonNull @SystemApi + public static final ParcelUuid COORDINATED_SET = + ParcelUuid.fromString("00001846-0000-1000-8000-00805F9B34FB"); + /** @hide */ + @NonNull + @SystemApi public static final ParcelUuid BASE_UUID = ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB"); |