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

Merge changes Icabed06e,I25bc13c6 am: afce05e2e5

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

Change-Id: Iccb3f39a62c0f8d34e986a12ca83e3c0b430b949
This commit is contained in:
Treehugger Robot
2021-08-10 02:31:28 +00:00
committed by Automerger Merge Worker
parent 3e8f4a285c afce05e2e5
commit 9de9c7f693
5 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -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

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

@@ -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;

3
core/java/android/bluetooth/BluetoothGatt.java
View File

@@ -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;

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

@@ -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

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

@@ -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");