diff options
| author | Rahul Sabnis <rahulsabnis@google.com> | 2021-07-02 22:32:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-02 22:32:05 +0000 |
| commit | b1cf3310aeeb39c07a889ed02c43987d69c9c521 (patch) | |
| tree | 3d05a49e6d98993ec7723028dab0e1de21978c71 /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 2eaa09027279c8b9429a5bf0cfe0a8079e1f5fd2 (diff) | |
| parent | ffc8b79fa873565ad46bcc2c70bec012d1b24e53 (diff) | |
Merge "Update BluetoothAdapter and BluetoothDevice documentation" am: 0591dcac60 am: 608a468332 am: ffc8b79fa8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1713250
Change-Id: Idb7e0d7d4b5ddafe9f461851655e2b01693eeecf
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 b0b247868b..60cde59436 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 */ |