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

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

Change-Id: Ibe3a20b81d84de18f0659aba80469d7a2e517521
This commit is contained in:
Treehugger Robot
2020-07-29 12:26:04 +00:00
committed by Automerger Merge Worker
parent 0a6a977dfe cc2d51fcef
commit ed914ce683
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

@@ -1450,7 +1450,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)
@@ -1484,7 +1484,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.
*/