diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2021-07-02 22:31:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-02 22:31:26 +0000 |
| commit | ffc8b79fa873565ad46bcc2c70bec012d1b24e53 (patch) | |
| tree | bc56b4f969e1d9227bafbe035007f8fe38bb07ea /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 71fa7426dbf56eea382fd6dfafd88ebb0ff80e9c (diff) | |
| parent | 608a46833283bab7cf5b464d57241947def3ab4e (diff) | |
Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 am: 608a468332
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250
Change-Id: I3c67ce35ae5c26ff497365fb3ab683474e2b4b69
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index a9ddefbaea..723be5868e 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -1799,9 +1799,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 */ |