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

Commit 25d2513d authored Feb 08, 2021 by Jakub Pawlowski Committed by Automerger Merge Worker Feb 08, 2021

Merge "Add Volume Control UUID" am: c50447ad am: de206f8a am: a42efdda

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30ba05c835a01d0edf0ec7e9e3fbc75fccd12e92

parents c935fed6 a42efdda

core/api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1990,6 +1990,7 @@ package android.bluetooth {
	field public static final int UUID_BYTES_128_BIT = 16; // 0x10		field public static final int UUID_BYTES_128_BIT = 16; // 0x10
	field public static final int UUID_BYTES_16_BIT = 2; // 0x2		field public static final int UUID_BYTES_16_BIT = 2; // 0x2
	field public static final int UUID_BYTES_32_BIT = 4; // 0x4		field public static final int UUID_BYTES_32_BIT = 4; // 0x4
			field @NonNull public static final android.os.ParcelUuid VOLUME_CONTROL;
	}		}

	public final class BufferConstraint implements android.os.Parcelable {		public final class BufferConstraint implements android.os.Parcelable {

core/java/android/bluetooth/BluetoothUuid.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -167,6 +167,11 @@ public final class BluetoothUuid {
	/** @hide */		/** @hide */
	@NonNull		@NonNull
	@SystemApi		@SystemApi
			public static final ParcelUuid VOLUME_CONTROL =
			ParcelUuid.fromString("00001844-0000-1000-8000-00805F9B34FB");
			/** @hide */
			@NonNull
			@SystemApi
	public static final ParcelUuid BASE_UUID =		public static final ParcelUuid BASE_UUID =
	ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB");		ParcelUuid.fromString("00000000-0000-1000-8000-00805F9B34FB");