Merge "Bluetooth: fix comments on Volume Control Profile review" (2cc60a35) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −1

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

	public static interface BluetoothProfile.ServiceListener {		public static interface BluetoothProfile.ServiceListener {

core/api/system-current.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1630,6 +1630,7 @@ package android.bluetooth {
	field public static final int PBAP_CLIENT = 17; // 0x11		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_OFF = 0; // 0x0
	field @Deprecated public static final int PRIORITY_ON = 100; // 0x64		field @Deprecated public static final int PRIORITY_ON = 100; // 0x64
			field public static final int VOLUME_CONTROL = 23; // 0x17
	}		}

	public final class BluetoothUuid {		public final class BluetoothUuid {

core/java/android/bluetooth/BluetoothProfile.java

+2 −0

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

	/**		/**

core/java/android/bluetooth/BluetoothVolumeControl.java

+0 −34

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

	/package/
	@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)		@RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
	public void close() {		public void close() {
	mProfileConnector.disconnect();		mProfileConnector.disconnect();
	@@ -211,23 +210,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
	*/
	@RequiresPermission(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		* Set connection policy of the profile
	*		*
	@@ -262,22 +244,6 @@ public final class BluetoothVolumeControl implements BluetoothProfile, AutoClose
	return false;		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
	*/
	@RequiresPermission(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.		* Get the connection policy of the profile.
	*		*