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

Commit 89cdb348 authored Nov 22, 2018 by android-build-team Robot

Snap for 5145130 from ecfc94150087d47e907f7afe466f441b3b85bad7 to qt-release

Change-Id: Ia1c6832fc1c9c0d5844a71161b74c4f606047be8

parents cdb58c0e f151a43c

framework/java/android/bluetooth/BluetoothDevice.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ public final class BluetoothDevice implements Parcelable {
		* device are requested to be fetched using Service Discovery Protocol
		* <p> Always contains the extra field {@link #EXTRA_DEVICE}
		* <p> Always contains the extra field {@link #EXTRA_UUID}
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} to receive.
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_UUID =

framework/java/android/bluetooth/BluetoothHeadset.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -973,11 +973,11 @@ public final class BluetoothHeadset implements BluetoothProfile {
		*/
		@UnsupportedAppUsage
		public void phoneStateChanged(int numActive, int numHeld, int callState, String number,
		int type) {
		int type, String name) {
		final IBluetoothHeadset service = mService;
		if (service != null && isEnabled()) {
		try {
		service.phoneStateChanged(numActive, numHeld, callState, number, type);
		service.phoneStateChanged(numActive, numHeld, callState, number, type, name);
		} catch (RemoteException e) {
		Log.e(TAG, e.toString());
		}

framework/java/android/bluetooth/BluetoothHearingAid.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
		*/
		public final class BluetoothHearingAid implements BluetoothProfile {
		private static final String TAG = "BluetoothHearingAid";
		private static final boolean DBG = false;
		private static final boolean DBG = true;
		private static final boolean VDBG = false;

		/**