Merge "Refactor Bluetooth Profile." (c04c457e) · Commits · e / os / android_frameworks_base

core/java/android/bluetooth/BluetoothA2dp.java

+64 −4

Original line number	Diff line number	Diff line
		@@ -130,7 +130,25 @@ public final class BluetoothA2dp implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate connection to a profile of the remote bluetooth device.
		*
		* <p> Currently, the system supports only 1 connection to the
		* A2DP profile. The API will automatically disconnect connected
		* devices before connecting.
		*
		* <p> This API returns false in scenarios like the profile on the
		* device is already connected or Bluetooth is not turned on.
		* When this API returns true, it is guaranteed that
		* connection state intent for the profile will be broadcasted with
		* the state. Users can get the connection state of the profile
		* from this intent.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean connect(BluetoothDevice device) {
		@@ -149,7 +167,29 @@ public final class BluetoothA2dp implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate disconnection from a profile
		*
		* <p> This API will return false in scenarios like the profile on the
		* Bluetooth device is not in connected state etc. When this API returns,
		* true, it is guaranteed that the connection state change
		* intent will be broadcasted with the state. Users can get the
		* disconnection state of the profile from this intent.
		*
		* <p> If the disconnection is initiated by a remote device, the state
		* will transition from {@link #STATE_CONNECTED} to
		* {@link #STATE_DISCONNECTED}. If the disconnect is initiated by the
		* host (local) device the state will transition from
		* {@link #STATE_CONNECTED} to state {@link #STATE_DISCONNECTING} to
		* state {@link #STATE_DISCONNECTED}. The transition to
		* {@link #STATE_DISCONNECTING} can be used to distinguish between the
		* two scenarios.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean disconnect(BluetoothDevice device) {
		@@ -220,7 +260,18 @@ public final class BluetoothA2dp implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} or
		* {@link #PRIORITY_OFF},
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		*/
		public boolean setPriority(BluetoothDevice device, int priority) {
		@@ -243,7 +294,16 @@ public final class BluetoothA2dp implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param device Bluetooth device
		* @return priority of the device
		* @hide
		*/
		public int getPriority(BluetoothDevice device) {

core/java/android/bluetooth/BluetoothHeadset.java

+64 −4

Original line number	Diff line number	Diff line
		@@ -248,7 +248,25 @@ public final class BluetoothHeadset implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate connection to a profile of the remote bluetooth device.
		*
		* <p> Currently, the system supports only 1 connection to the
		* headset/handsfree profile. The API will automatically disconnect connected
		* devices before connecting.
		*
		* <p> This API returns false in scenarios like the profile on the
		* device is already connected or Bluetooth is not turned on.
		* When this API returns true, it is guaranteed that
		* connection state intent for the profile will be broadcasted with
		* the state. Users can get the connection state of the profile
		* from this intent.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean connect(BluetoothDevice device) {
		@@ -267,7 +285,29 @@ public final class BluetoothHeadset implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate disconnection from a profile
		*
		* <p> This API will return false in scenarios like the profile on the
		* Bluetooth device is not in connected state etc. When this API returns,
		* true, it is guaranteed that the connection state change
		* intent will be broadcasted with the state. Users can get the
		* disconnection state of the profile from this intent.
		*
		* <p> If the disconnection is initiated by a remote device, the state
		* will transition from {@link #STATE_CONNECTED} to
		* {@link #STATE_DISCONNECTED}. If the disconnect is initiated by the
		* host (local) device the state will transition from
		* {@link #STATE_CONNECTED} to state {@link #STATE_DISCONNECTING} to
		* state {@link #STATE_DISCONNECTED}. The transition to
		* {@link #STATE_DISCONNECTING} can be used to distinguish between the
		* two scenarios.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean disconnect(BluetoothDevice device) {
		@@ -338,7 +378,18 @@ public final class BluetoothHeadset implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} or
		* {@link #PRIORITY_OFF},
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		*/
		public boolean setPriority(BluetoothDevice device, int priority) {
		@@ -361,7 +412,16 @@ public final class BluetoothHeadset implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param device Bluetooth device
		* @return priority of the device
		* @hide
		*/
		public int getPriority(BluetoothDevice device) {

core/java/android/bluetooth/BluetoothInputDevice.java

+62 −4

Original line number	Diff line number	Diff line
		@@ -119,7 +119,23 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate connection to a profile of the remote bluetooth device.
		*
		* <p> The system supports connection to multiple input devices.
		*
		* <p> This API returns false in scenarios like the profile on the
		* device is already connected or Bluetooth is not turned on.
		* When this API returns true, it is guaranteed that
		* connection state intent for the profile will be broadcasted with
		* the state. Users can get the connection state of the profile
		* from this intent.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean connect(BluetoothDevice device) {
		@@ -138,7 +154,29 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate disconnection from a profile
		*
		* <p> This API will return false in scenarios like the profile on the
		* Bluetooth device is not in connected state etc. When this API returns,
		* true, it is guaranteed that the connection state change
		* intent will be broadcasted with the state. Users can get the
		* disconnection state of the profile from this intent.
		*
		* <p> If the disconnection is initiated by a remote device, the state
		* will transition from {@link #STATE_CONNECTED} to
		* {@link #STATE_DISCONNECTED}. If the disconnect is initiated by the
		* host (local) device the state will transition from
		* {@link #STATE_CONNECTED} to state {@link #STATE_DISCONNECTING} to
		* state {@link #STATE_DISCONNECTED}. The transition to
		* {@link #STATE_DISCONNECTING} can be used to distinguish between the
		* two scenarios.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean disconnect(BluetoothDevice device) {
		@@ -209,7 +247,18 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} or
		* {@link #PRIORITY_OFF},
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		*/
		public boolean setPriority(BluetoothDevice device, int priority) {
		@@ -232,7 +281,16 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param device Bluetooth device
		* @return priority of the device
		* @hide
		*/
		public int getPriority(BluetoothDevice device) {

core/java/android/bluetooth/BluetoothPan.java

+38 −23

Original line number	Diff line number	Diff line
		@@ -140,7 +140,21 @@ public final class BluetoothPan implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate connection to a profile of the remote bluetooth device.
		*
		* <p> This API returns false in scenarios like the profile on the
		* device is already connected or Bluetooth is not turned on.
		* When this API returns true, it is guaranteed that
		* connection state intent for the profile will be broadcasted with
		* the state. Users can get the connection state of the profile
		* from this intent.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean connect(BluetoothDevice device) {
		@@ -159,7 +173,29 @@ public final class BluetoothPan implements BluetoothProfile {
		}

		/**
		* {@inheritDoc}
		* Initiate disconnection from a profile
		*
		* <p> This API will return false in scenarios like the profile on the
		* Bluetooth device is not in connected state etc. When this API returns,
		* true, it is guaranteed that the connection state change
		* intent will be broadcasted with the state. Users can get the
		* disconnection state of the profile from this intent.
		*
		* <p> If the disconnection is initiated by a remote device, the state
		* will transition from {@link #STATE_CONNECTED} to
		* {@link #STATE_DISCONNECTED}. If the disconnect is initiated by the
		* host (local) device the state will transition from
		* {@link #STATE_CONNECTED} to state {@link #STATE_DISCONNECTING} to
		* state {@link #STATE_DISCONNECTED}. The transition to
		* {@link #STATE_DISCONNECTING} can be used to distinguish between the
		* two scenarios.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean disconnect(BluetoothDevice device) {
		@@ -229,27 +265,6 @@ public final class BluetoothPan implements BluetoothProfile {
		return BluetoothProfile.STATE_DISCONNECTED;
		}

		/**
		* {@inheritDoc}
		* @hide
		*/
		public boolean setPriority(BluetoothDevice device, int priority) {
		// Priorities are not supported for PAN devices - since we don't
		// auto connect.
		return false;
		}

		/**
		* {@inheritDoc}
		* @hide
		*/
		public int getPriority(BluetoothDevice device) {
		if (DBG) log("getPriority(" + device + ")");
		// Priorities are not supported for PAN devices - since we don't
		// auto connect.
		return BluetoothProfile.PRIORITY_ON;
		}

		public void setBluetoothTethering(boolean value) {
		if (DBG) log("setBluetoothTethering(" + value + ")");
		try {

core/java/android/bluetooth/BluetoothProfile.java

+0 −84

Original line number	Diff line number	Diff line
		@@ -103,58 +103,6 @@ public interface BluetoothProfile {
		* */
		public static final int PRIORITY_UNDEFINED = -1;

		/**
		* Initiate connection to a profile of the remote bluetooth device.
		*
		* <p> Currently, the system supports only 1 connection to the
		* A2DP and Headset/Handsfree profile. The API will automatically
		* disconnect connected devices before connecting.
		*
		* <p> This API returns false in scenarios like the profile on the
		* device is already connected or Bluetooth is not turned on.
		* When this API returns true, it is guaranteed that
		* connection state intent for the profile will be broadcasted with
		* the state. Users can get the connection state of the profile
		* from this intent.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean connect(BluetoothDevice device);

		/**
		* Initiate disconnection from a profile
		*
		* <p> This API will return false in scenarios like the profile on the
		* Bluetooth device is not in connected state etc. When this API returns,
		* true, it is guaranteed that the connection state change
		* intent will be broadcasted with the state. Users can get the
		* disconnection state of the profile from this intent.
		*
		* <p> If the disconnection is initiated by a remote device, the state
		* will transition from {@link #STATE_CONNECTED} to
		* {@link #STATE_DISCONNECTED}. If the disconnect is initiated by the
		* host (local) device the state will transition from
		* {@link #STATE_CONNECTED} to state {@link #STATE_DISCONNECTING} to
		* state {@link #STATE_DISCONNECTED}. The transition to
		* {@link #STATE_DISCONNECTING} can be used to distinguish between the
		* two scenarios.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Remote Bluetooth Device
		* @return false on immediate error,
		* true otherwise
		* @hide
		*/
		public boolean disconnect(BluetoothDevice device);

		/**
		* Get connected devices for this specific profile.
		*
		@@ -194,38 +142,6 @@ public interface BluetoothProfile {
		*/
		public int getConnectionState(BluetoothDevice device);

		/**
		* Set priority of the profile
		*
		* <p> The device should already be paired.
		* Priority can be one of {@link #PRIORITY_ON} or
		* {@link #PRIORITY_OFF},
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission.
		*
		* @param device Paired bluetooth device
		* @param priority
		* @return true if priority is set, false on error
		* @hide
		*/
		public boolean setPriority(BluetoothDevice device, int priority);

		/**
		* Get the priority of the profile.
		*
		* <p> The priority can be any of:
		* {@link #PRIORITY_AUTO_CONNECT}, {@link #PRIORITY_OFF},
		* {@link #PRIORITY_ON}, {@link #PRIORITY_UNDEFINED}
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param device Bluetooth device
		* @return priority of the device
		* @hide
		*/
		public int getPriority(BluetoothDevice device);

		/**
		* An interface for notifying BluetoothProfile IPC clients when they have
		* been connected or disconnected to the service.