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

Commit b837ae60 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: cc2d51fcef am: e493ee5f am: d7209e36

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

Change-Id: Ib418b4e6a0a10ce5f9e4f1e718d1cf294610024b
parents 8cffffd7 d7209e36

framework/java/android/bluetooth/BluetoothDevice.java

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

     */