Merge "More auto-doc work." into oc-dev (345bc3d9) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothA2dp.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -422,8 +422,6 @@ public final class BluetoothA2dp implements BluetoothProfile {
		* {@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

framework/java/android/bluetooth/BluetoothAdapter.java

+0 −24

Original line number	Diff line number	Diff line
		@@ -697,7 +697,6 @@ public final class BluetoothAdapter {
		* Return true if Bluetooth is currently enabled and ready for use.
		* <p>Equivalent to:
		* <code>getBluetoothState() == STATE_ON</code>
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @return true if the local adapter is turned on
		*/
		@@ -835,7 +834,6 @@ public final class BluetoothAdapter {
		* {@link #STATE_TURNING_ON},
		* {@link #STATE_ON},
		* {@link #STATE_TURNING_OFF}.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @return current state of Bluetooth adapter
		*/
		@@ -878,7 +876,6 @@ public final class BluetoothAdapter {
		* {@link #STATE_ON},
		* {@link #STATE_TURNING_OFF},
		* {@link #STATE_BLE_TURNING_OFF}.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @return current state of Bluetooth adapter
		* @hide
		@@ -934,8 +931,6 @@ public final class BluetoothAdapter {
		* #STATE_ON}. If this call returns false then there was an
		* immediate problem that will prevent the adapter from being turned on -
		* such as Airplane mode, or the adapter is already turned on.
		* <p>Requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission
		*
		* @return true to indicate adapter startup has begun, or false on
		* immediate error
		@@ -970,8 +965,6 @@ public final class BluetoothAdapter {
		* #STATE_ON}. If this call returns false then there was an
		* immediate problem that will prevent the adapter from being turned off -
		* such as the adapter already being turned off.
		* <p>Requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		* permission
		*
		* @return true to indicate adapter shutdown has begun, or false on
		* immediate error
		@@ -1005,7 +998,6 @@ public final class BluetoothAdapter {
		/**
		* Returns the hardware address of the local Bluetooth adapter.
		* <p>For example, "00:11:22:AA:BB:CC".
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @return Bluetooth hardware address as string
		*/
		@@ -1109,7 +1101,6 @@ public final class BluetoothAdapter {
		* will return false. After turning on Bluetooth,
		* wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON}
		* to get the updated value.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}
		*
		* @param name a valid Bluetooth name
		* @return true if the name was set, false otherwise
		@@ -1140,7 +1131,6 @@ public final class BluetoothAdapter {
		* will return {@link #SCAN_MODE_NONE}. After turning on Bluetooth,
		* wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON}
		* to get the updated value.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @return scan mode
		*/
		@@ -1279,7 +1269,6 @@ public final class BluetoothAdapter {
		* will return false. After turning on Bluetooth,
		* wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON}
		* to get the updated value.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
		*
		* @return true on success, false on error
		*/
		@@ -1299,7 +1288,6 @@ public final class BluetoothAdapter {

		/**
		* Cancel the current device discovery process.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
		* <p>Because discovery is a heavyweight procedure for the Bluetooth
		* adapter, this method should always be called before attempting to connect
		* to a remote device with {@link
		@@ -1343,7 +1331,6 @@ public final class BluetoothAdapter {
		* will return false. After turning on Bluetooth,
		* wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON}
		* to get the updated value.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return true if discovering
		*/
		@@ -1610,7 +1597,6 @@ public final class BluetoothAdapter {
		* will return an empty set. After turning on Bluetooth,
		* wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON}
		* to get the updated value.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return unmodifiable set of {@link BluetoothDevice}, or null on error
		*/
		@@ -1695,8 +1681,6 @@ public final class BluetoothAdapter {
		* Profile can be one of {@link BluetoothProfile#HEALTH}, {@link BluetoothProfile#HEADSET},
		* {@link BluetoothProfile#A2DP}.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* <p> Return value can be one of
		* {@link BluetoothProfile#STATE_DISCONNECTED},
		* {@link BluetoothProfile#STATE_CONNECTING},
		@@ -1786,7 +1770,6 @@ public final class BluetoothAdapter {
		* closed, or if this application closes unexpectedly.
		* <p>Use {@link BluetoothDevice#createRfcommSocketToServiceRecord} to
		* connect to this socket from another device using the same {@link UUID}.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		* @param name service name for SDP record
		* @param uuid uuid for SDP record
		* @return a listening RFCOMM BluetoothServerSocket
		@@ -1818,7 +1801,6 @@ public final class BluetoothAdapter {
		* closed, or if this application closes unexpectedly.
		* <p>Use {@link BluetoothDevice#createRfcommSocketToServiceRecord} to
		* connect to this socket from another device using the same {@link UUID}.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		* @param name service name for SDP record
		* @param uuid uuid for SDP record
		* @return a listening RFCOMM BluetoothServerSocket
		@@ -2410,8 +2392,6 @@ public final class BluetoothAdapter {
		* <p>Results of the scan are reported using the
		* {@link LeScanCallback#onLeScan} callback.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.
		*
		* @param callback the callback LE scan results are delivered
		* @return true, if the scan was started successfully
		* @deprecated use {@link BluetoothLeScanner#startScan(List, ScanSettings, ScanCallback)}
		@@ -2430,8 +2410,6 @@ public final class BluetoothAdapter {
		* <p>Devices which advertise all specified services are reported using the
		* {@link LeScanCallback#onLeScan} callback.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.
		*
		* @param serviceUuids Array of services to look for
		* @param callback the callback LE scan results are delivered
		* @return true, if the scan was started successfully
		@@ -2519,8 +2497,6 @@ public final class BluetoothAdapter {
		/**
		* Stops an ongoing Bluetooth LE device scan.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission.
		*
		* @param callback used to identify which scan to stop
		* must be the same handle used to start the scan
		* @deprecated Use {@link BluetoothLeScanner#stopScan(ScanCallback)} instead.

framework/java/android/bluetooth/BluetoothDevice.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -762,7 +762,6 @@ public final class BluetoothDevice implements Parcelable {
		* <p>The local adapter will automatically retrieve remote names when
		* performing a device scan, and will cache them. This method just returns
		* the name for this device from the cache.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @return the Bluetooth name, or null if there was a problem.
		*/
		@@ -781,8 +780,6 @@ public final class BluetoothDevice implements Parcelable {
		/**
		* Get the Bluetooth device type of the remote device.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @return the device type {@link #DEVICE_TYPE_CLASSIC}, {@link #DEVICE_TYPE_LE}
		* {@link #DEVICE_TYPE_DUAL}.
		* {@link #DEVICE_TYPE_UNKNOWN} if it's not available
		@@ -862,7 +859,6 @@ public final class BluetoothDevice implements Parcelable {
		* the bonding process completes, and its result.
		* <p>Android system services will handle the necessary user interactions
		* to confirm and complete the bonding process.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
		*
		* @return false on immediate error, true if bonding will begin
		*/
		@@ -1022,7 +1018,6 @@ public final class BluetoothDevice implements Parcelable {
		* {@link #BOND_NONE},
		* {@link #BOND_BONDING},
		* {@link #BOND_BONDED}.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return the bond state
		*/
		@@ -1089,7 +1084,6 @@ public final class BluetoothDevice implements Parcelable {

		/**
		* Get the Bluetooth class of the remote device.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return Bluetooth class object, or null on error
		*/
		@@ -1114,7 +1108,6 @@ public final class BluetoothDevice implements Parcelable {
		* from the remote device. Instead, the local cached copy of the service
		* UUIDs are returned.
		* <p>Use {@link #fetchUuidsWithSdp} if fresh UUIDs are desired.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return the supported features (UUIDs) of the remote device,
		* or null on error
		@@ -1140,7 +1133,6 @@ public final class BluetoothDevice implements Parcelable {
		* {@link #ACTION_UUID} intent is sent with the UUIDs that is currently
		* present in the cache. Clients should use the {@link #getUuids} to get UUIDs
		* if service discovery is not to be performed.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}.
		*
		* @return False if the sanity check fails, True if the process
		* of initiating an ACL connection to the remote device
		@@ -1221,7 +1213,6 @@ public final class BluetoothDevice implements Parcelable {

		/**
		* Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.
		*
		* @return true confirmation has been sent out
		* false for error
		@@ -1502,7 +1493,6 @@ public final class BluetoothDevice implements Parcelable {
		* using the well-known SPP UUID 00001101-0000-1000-8000-00805F9B34FB.
		* However if you are connecting to an Android peer then please generate
		* your own unique UUID.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @param uuid service record uuid to lookup RFCOMM channel
		* @return a RFCOMM BluetoothServerSocket ready for an outgoing connection
		@@ -1541,7 +1531,6 @@ public final class BluetoothDevice implements Parcelable {
		* using the well-known SPP UUID 00001101-0000-1000-8000-00805F9B34FB.
		* However if you are connecting to an Android peer then please generate
		* your own unique UUID.
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH}
		*
		* @param uuid service record uuid to lookup RFCOMM channel
		* @return a RFCOMM BluetoothServerSocket ready for an outgoing connection

framework/java/android/bluetooth/BluetoothManager.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -85,8 +85,6 @@ public final class BluetoothManager {
		* This can be used by applications like status bar which would just like
		* to know the state of Bluetooth.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param device Remote bluetooth device.
		* @param profile GATT or GATT_SERVER
		* @return State of the profile connection. One of
		@@ -118,8 +116,6 @@ public final class BluetoothManager {
		* This can be used by applications like status bar which would just like
		* to know the state of Bluetooth.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param profile GATT or GATT_SERVER
		* @return List of devices. The list will be empty on error.
		*/
		@@ -159,8 +155,6 @@ public final class BluetoothManager {
		* This can be used by applications like status bar which would just like
		* to know the state of the local adapter.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param profile GATT or GATT_SERVER
		* @param states Array of states. States can be one of
		* {@link BluetoothProfile#STATE_CONNECTED}, {@link BluetoothProfile#STATE_CONNECTING},

framework/java/android/bluetooth/BluetoothProfile.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -187,8 +187,6 @@ public interface BluetoothProfile {
		*
		* <p> Return the set of devices which are in state {@link #STATE_CONNECTED}
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @return List of devices. The list will be empty on error.
		*/
		@RequiresPermission(Manifest.permission.BLUETOOTH)
		@@ -201,8 +199,6 @@ public interface BluetoothProfile {
		* <p> If none of the devices match any of the given states,
		* an empty list will be returned.
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param states Array of states. States can be one of
		* {@link #STATE_CONNECTED}, {@link #STATE_CONNECTING},
		* {@link #STATE_DISCONNECTED}, {@link #STATE_DISCONNECTING},
		@@ -214,8 +210,6 @@ public interface BluetoothProfile {
		/**
		* Get the current connection state of the profile
		*
		* <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission.
		*
		* @param device Remote bluetooth device.
		* @return State of the profile connection. One of
		* {@link #STATE_CONNECTED}, {@link #STATE_CONNECTING},