Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd071014 authored by Jakub Pawlowski's avatar Jakub Pawlowski Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I46e543b7fd25dbb74d97551cab50a18cfaad594d
parents d0c69c22 f0307d11

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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;

core/java/android/bluetooth/BluetoothProfile.java

+7 −1
Original line number Diff line number Diff line
@@ -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

core/java/android/bluetooth/BluetoothUuid.java

+5 −0
Original line number Diff line number Diff line
@@ -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");