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

Merge "csip: Add constants for the Coordinated Set Identification Profile" am: 54beaf2012

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

Change-Id: I707c1fdd5831763a3bcdfa819e61ea3b01707110
This commit is contained in:
Jakub Pawlowski
2021-08-30 21:10:26 +00:00
committed by Automerger Merge Worker
parent 2b3dbdd95b 54beaf2012
commit f0307d111e
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -9447,6 +9447,7 @@ package android.bluetooth {
method public int getConnectionState(android.bluetooth.BluetoothDevice);
method 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

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

@@ -2105,6 +2105,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;

8
core/java/android/bluetooth/BluetoothProfile.java
View File

@@ -226,13 +226,19 @@ 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

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

@@ -184,6 +184,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");