diff options
| author | 2021-07-02 22:01:50 +0000 | |
|---|---|---|
| committer | 2021-07-02 22:01:50 +0000 | |
| commit | 0591dcac60b4608a5fa8085f4e5be2b6e9c484c0 (patch) | |
| tree | 68e7964ea273c43cce508a008bb6bd4a1b728fbc | |
| parent | 447fbc3788fed66e9d4199c9b2b9c7b9b9a42091 (diff) | |
| parent | d748e6ec7a7720c7d0326137be7298be40b32289 (diff) | |
Merge "Update BluetoothAdapter and BluetoothDevice documentation"
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 7 | ||||
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index e305aa8e33a0..ce384868d446 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -1698,9 +1698,10 @@ public final class BluetoothAdapter { * <i>discoverable</i> (inquiry scan enabled). Many Bluetooth devices are * not discoverable by default, and need to be entered into a special mode. * <p>If Bluetooth state is not {@link #STATE_ON}, this API - * will return false. After turning on Bluetooth, - * wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON} - * to get the updated value. + * will return false. After turning on Bluetooth, wait for {@link #ACTION_STATE_CHANGED} + * with {@link #STATE_ON} to get the updated value. + * <p>If a device is currently bonding, this request will be queued and executed once that + * device has finished bonding. If a request is already queued, this request will be ignored. * * @return true on success, false on error */ diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 11b45e32c425..07dbe52a2c66 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1608,7 +1608,8 @@ public final class BluetoothDevice implements Parcelable { * in getting the SDP records or if the process takes a long time, or the device is bonding and * we have its UUIDs cached, {@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. + * if service discovery is not to be performed. If there is an ongoing bonding process, + * service discovery or device inquiry, the request will be queued. * * @return False if the check fails, True if the process of initiating an ACL connection * to the remote device was started or cached UUIDs will be broadcast. |