Merge changes Icabed06e,I25bc13c6 am: 020a379b50 am: dcea1a5aa5 (80b57a51) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothGatt.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,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;

+8 −1

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

Original line number	Diff line number	Diff line
		@@ -174,6 +174,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");