Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0591dcac authored by Rahul Sabnis's avatar Rahul Sabnis Committed by Gerrit Code Review
Browse files

Merge "Update BluetoothAdapter and BluetoothDevice documentation"

parents 447fbc37 d748e6ec

core/java/android/bluetooth/BluetoothAdapter.java

+4 −3
Original line number Diff line number Diff line
@@ -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

     */

core/java/android/bluetooth/BluetoothDevice.java

+2 −1
Original line number Diff line number Diff line
@@ -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.