Merge "Bluetooth: fix comments on Volume Control Profile review am: 37c700dbbe" (986b2464) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -9458,7 +9458,6 @@ package android.bluetooth {
		field public static final int STATE_CONNECTING = 1; // 0x1
		field public static final int STATE_DISCONNECTED = 0; // 0x0
		field public static final int STATE_DISCONNECTING = 3; // 0x3
		field public static final int VOLUME_CONTROL = 23; // 0x17
		}

		public static interface BluetoothProfile.ServiceListener {

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -2087,6 +2087,7 @@ package android.bluetooth {
		field public static final int PBAP_CLIENT = 17; // 0x11
		field @Deprecated public static final int PRIORITY_OFF = 0; // 0x0
		field @Deprecated public static final int PRIORITY_ON = 100; // 0x64
		field public static final int VOLUME_CONTROL = 23; // 0x17
		}

		public final class BluetoothStatusCodes {

core/java/android/bluetooth/BluetoothProfile.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -215,7 +215,9 @@ public interface BluetoothProfile {
		/**
		* Volume Control profile
		*
		* @hide
		*/
		@SystemApi
		int VOLUME_CONTROL = 23;

		/**

core/java/android/bluetooth/BluetoothVolumeControl.java

+0 −42

Original line number	Diff line number	Diff line
		@@ -113,7 +113,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
		close();
		}

		/package/
		@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
		public void close() {
		mProfileConnector.disconnect();
		@@ -230,27 +229,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
		}
		}

		/**
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} or {@link #PRIORITY_OFF},
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		})
		public boolean setPriority(BluetoothDevice device, int priority) {
		if (DBG) log("setPriority(" + device + ", " + priority + ")");
		return setConnectionPolicy(device, BluetoothAdapter.priorityToConnectionPolicy(priority));
		}

		/**
		* Set connection policy of the profile
		*
		@@ -289,26 +267,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
		return false;
		}

		/**
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_OFF}, {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* @param device Bluetooth device
		* @return priority of the device
		* @hide
		*/
		@RequiresBluetoothConnectPermission
		@RequiresPermission(allOf = {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		})
		public int getPriority(BluetoothDevice device) {
		if (VDBG) log("getPriority(" + device + ")");
		return BluetoothAdapter.connectionPolicyToPriority(getConnectionPolicy(device));
		}

		/**
		* Get the connection policy of the profile.
		*