summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-07-29 12:58:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-29 12:58:30 +0000
commite7d2991fb28e44b546fbfb69fe8243c6a96d852e (patch)
tree250bbb3c531b01c0314c311038c808716e185309
parent5c287bfd370416dfcb6a5a447beb6063f22448de (diff)
parent512c1c5ab940839808405603745c040c8f0dbfe2 (diff)
Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683 am: 512c1c5ab9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017 Change-Id: Ib418b4e6a0a10ce5f9e4f1e718d1cf294610024b
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index dc7d05300d45..5c13c08f752f 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1462,7 +1462,7 @@ public final class BluetoothDevice implements Parcelable {
* 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 sanity check fails, True if the process of initiating an ACL connection
+ * @return False if the check fails, True if the process of initiating an ACL connection
* to the remote device was started.
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
@@ -1496,7 +1496,7 @@ public final class BluetoothDevice implements Parcelable {
* The object type will match one of the SdpXxxRecord types, depending on the UUID searched
* for.
*
- * @return False if the sanity check fails, True if the process
+ * @return False if the check fails, True if the process
* of initiating an ACL connection to the remote device
* was started.
*/