Merge "Revert "Complete hard removal of BluetoothHeadset#setPriority system API that"" (1dfa431f) · Commits · e / os / android_frameworks_base

core/api/system-removed.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,14 @@ package android.app.search {

		}

		package android.bluetooth {

		public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
		method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean setPriority(android.bluetooth.BluetoothDevice, int);
		}

		}

		package android.content {

		public class Intent implements java.lang.Cloneable android.os.Parcelable {

+43 −0

Original line number	Diff line number	Diff line
		@@ -600,6 +600,49 @@ public final class BluetoothHeadset implements BluetoothProfile {
		return BluetoothProfile.STATE_DISCONNECTED;
		}

		/**
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link BluetoothProfile#PRIORITY_ON} or
		* {@link BluetoothProfile#PRIORITY_OFF}
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		* @deprecated Replaced with {@link #setConnectionPolicy(BluetoothDevice, int)}
		* @removed
		*/
		@Deprecated
		@SystemApi
		@RequiresLegacyBluetoothAdminPermission
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.MODIFY_PHONE_STATE,
		})
		public boolean setPriority(BluetoothDevice device, int priority) {
		if (DBG) log("setPriority(" + device + ", " + priority + ")");
		final IBluetoothHeadset service = mService;
		if (service != null && isEnabled() && isValidDevice(device)) {
		if (priority != BluetoothProfile.PRIORITY_OFF
		&& priority != BluetoothProfile.PRIORITY_ON) {
		return false;
		}
		try {
		return service.setPriority(
		device, BluetoothAdapter.priorityToConnectionPolicy(priority),
		mAttributionSource);
		} catch (RemoteException e) {
		Log.e(TAG, Log.getStackTraceString(new Throwable()));
		return false;
		}
		}
		if (service == null) Log.w(TAG, "Proxy not attached to service");
		return false;
		}

		/**
		* Set connection policy of the profile
		*