summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Rahul Sabnis <rahulsabnis@google.com> 2021-05-10 20:34:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-05-10 20:34:06 +0000
commit27918f0cf24d2283dff4577a2700aaf19f022ea7 (patch)
tree79bbd6cb236fd6579b4cfc2c6f28dab62c46b707
parentc8c54db5374b28b70803ebe2d17d849bc3bb16d2 (diff)
parentd8c539d8b87759ba87412aab7427dfdcde1b175a (diff)
Merge "Update docs for BluetoothDevice#fetchUuidsWithSdp to reflect that if the device is bonding, we either broadcast cached UUIDs or wait for SDP to be performed after the device is bonded." am: d8c539d8b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698769 Change-Id: I80a142b64d16b00e973112e35dae2c5d962839b8
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index a40bf343239e..11b45e32c425 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1605,13 +1605,13 @@ public final class BluetoothDevice implements Parcelable {
*
* <p>This API is asynchronous and {@link #ACTION_UUID} intent is sent,
* with the UUIDs supported by the remote end. If there is an error
- * in getting the SDP records or if the process takes a long time,
- * {@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
+ * 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.
*
* @return False if the check fails, True if the process of initiating an ACL connection
- * to the remote device was started.
+ * to the remote device was started or cached UUIDs will be broadcast.
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public boolean fetchUuidsWithSdp() {