Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683 am: 512c1c5ab9 am: e7d2991fb2 am: c08b68d049

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

Change-Id: Ife7a9e5dbd75d0bbe6d40ee257e50ea998df4822
This commit is contained in:
Treehugger Robot
2020-07-29 13:33:29 +00:00
committed by Automerger Merge Worker
parent 84e70df9d4 c08b68d049
commit b3838bbbb0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -1482,7 +1482,7 @@ public final class BluetoothDevice implements Parcelable {
* present in the cache. Clients should use the {@link #getUuids} to get UUIDs * present in the cache. Clients should use the {@link #getUuids} to get UUIDs
* if service discovery is not to be performed. * 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. * to the remote device was started.
*/ */
@RequiresPermission(Manifest.permission.BLUETOOTH) @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 * The object type will match one of the SdpXxxRecord types, depending on the UUID searched
* for. * 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 * of initiating an ACL connection to the remote device
* was started. * was started.
*/ */