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

Commit afce05e2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Icabed06e,I25bc13c6 

* changes:
  Bluetooth: Add Media Control Profile
  Bluetooth: Add GATT_INSUFFICIENT_AUTHORIZATION error code
parents 89320ec0 723fe23c

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8756,6 +8756,7 @@ package android.bluetooth { 
    field public static final int GATT_CONNECTION_CONGESTED = 143; // 0x8f

    field public static final int GATT_FAILURE = 257; // 0x101

    field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5

    field public static final int GATT_INSUFFICIENT_AUTHORIZATION = 8; // 0x8

    field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf

    field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd

    field public static final int GATT_INVALID_OFFSET = 7; // 0x7

core/api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,7 @@ package android.bluetooth { 
    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 DIP;

    field @NonNull public static final android.os.ParcelUuid GENERIC_MEDIA_CONTROL;

    field @NonNull public static final android.os.ParcelUuid HEARING_AID;

    field @NonNull public static final android.os.ParcelUuid HFP;

    field @NonNull public static final android.os.ParcelUuid HFP_AG;
@@ -1654,6 +1655,7 @@ package android.bluetooth { 
    field @NonNull public static final android.os.ParcelUuid LE_AUDIO;

    field @NonNull public static final android.os.ParcelUuid MAP;

    field @NonNull public static final android.os.ParcelUuid MAS;

    field @NonNull public static final android.os.ParcelUuid MEDIA_CONTROL;

    field @NonNull public static final android.os.ParcelUuid MNS;

    field @NonNull public static final android.os.ParcelUuid NAP;

    field @NonNull public static final android.os.ParcelUuid OBEX_OBJECT_PUSH;

core/java/android/bluetooth/BluetoothGatt.java

+3 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ public final class BluetoothGatt implements BluetoothProfile { 
    /** A read or write operation was requested with an invalid offset */

    public static final int GATT_INVALID_OFFSET = 0x7;



    /** Insufficient authorization for a given operation */

    public static final int GATT_INSUFFICIENT_AUTHORIZATION = 0x8;



    /** A write operation exceeds the maximum length of the attribute */

    public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 0xd;

core/java/android/bluetooth/BluetoothProfile.java

+8 −1
Original line number Diff line number Diff line
@@ -221,13 +221,20 @@ public interface BluetoothProfile { 
    @SystemApi

    int VOLUME_CONTROL = 23;



    /**

     * @hide

     * Media Control Profile server

     *

     */

    int MCP_SERVER = 24;



    /**

     * 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 = 23;

    int MAX_PROFILE_ID = 24;



    /**

     * Default priority for devices that we try to auto-connect to and

core/java/android/bluetooth/BluetoothUuid.java

+10 −0
Original line number Diff line number Diff line
@@ -172,6 +172,16 @@ public final class BluetoothUuid { 
    /** @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid GENERIC_MEDIA_CONTROL =

            ParcelUuid.fromString("00001849-0000-1000-8000-00805F9B34FB");

    /** @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid MEDIA_CONTROL =

            ParcelUuid.fromString("00001848-0000-1000-8000-00805F9B34FB");

    /** @hide */

    @NonNull

    @SystemApi

    public static final ParcelUuid BASE_UUID =

            ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB");