diff options
| author | 2021-05-10 21:21:20 +0000 | |
|---|---|---|
| committer | 2021-05-10 21:21:20 +0000 | |
| commit | 30002e7cd3970cbfc366ecefb51591a96aa90e7f (patch) | |
| tree | 627cb05cb1d482dd8f64db4b81b18ff0e9fbae62 | |
| parent | cad1671717930373350833674c36775b26836b71 (diff) | |
| parent | 634cd4579557eae7bb0cbf67977a28387739db3f (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 am: 27918f0cf2 am: 634cd45795
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1698769
Change-Id: I0b4ae79183c1b6e72c75369a25ca375acd4e5331
| -rw-r--r-- | core/java/android/bluetooth/BluetoothDevice.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 0ca6d74c6759..40326631402f 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -1770,13 +1770,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. */ @RequiresLegacyBluetoothPermission @RequiresBluetoothConnectPermission |