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

Commit b3838bbb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fc am: ed914ce6 am: 512c1c5a am: e7d2991f am: c08b68d0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017

Change-Id: Ife7a9e5dbd75d0bbe6d40ee257e50ea998df4822
parents 84e70df9 c08b68d0

core/java/android/bluetooth/BluetoothDevice.java

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

     */