summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-07-29 13:33:29 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-29 13:33:29 +0000
commitb3838bbbb0a96cc80098de48b63d1a8ef5d604e3 (patch)
treeeee6aa8c87684b9a1886437f5bbf2850ea36de39
parent84e70df9d49bcb88c4ee3afc40a09f25c7ff193a (diff)
parentc08b68d0499833669914a22c3878ab1e7b21dbcc (diff)
Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683 am: 512c1c5ab9 am: e7d2991fb2 am: c08b68d049
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017 Change-Id: Ife7a9e5dbd75d0bbe6d40ee257e50ea998df4822
-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 fb9746830d4e..fa3df1da5935 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1482,7 +1482,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)
@@ -1516,7 +1516,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.
*/