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

Merge "Merge "Bluetooth: fix comment wording" am: 6ba7c54a51 am: eeedda1453 am: ba2222aabb" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-03-29 18:40:34 +00:00
committed by Android (Google) Code Review
parent a81040a335 a6478d3a59
commit b676a1b8fa
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/bluetooth/le/AdvertisingSetParameters.java
View File

@@ -253,10 +253,10 @@ public final class AdvertisingSetParameters implements Parcelable {
/** /**
* Set whether the advertisement type should be connectable or * Set whether the advertisement type should be connectable or
* non-connectable. * non-connectable.
* Legacy advertisements can be both connectable and scannable. Other * Legacy advertisements must be both connectable and scannable. Nonlegacy
* advertisements can be connectable only if not scannable. * advertisements can be only scannable or only connectable.
* @param connectable Controls whether the advertisment type will be * @param connectable Controls whether the advertisment type will be
* connectable (true) or non-connectable (false). * connectable (true) or nonconnectable (false).
*/ */
public Builder setConnectable(boolean connectable) { public Builder setConnectable(boolean connectable) {
this.connectable = connectable; this.connectable = connectable;
@@ -264,11 +264,11 @@ public final class AdvertisingSetParameters implements Parcelable {
} }
/** /**
* Set whether the advertisement type should be scannable * Set whether the advertisement type should be scannable.
* Legacy advertisements can be both connectable and scannable. Other * Legacy advertisements must be both connectable and scannable. Nonlegacy
* advertisements can be scannable only if not connectable. * advertisements can be only scannable or only connectable.
* @param scannable Controls whether the advertisment type will be * @param scannable Controls whether the advertisment type will be
* scannable (true) or non-scannable (false). * scannable (true) or nonscannable (false).
*/ */
public Builder setScannable(boolean scannable) { public Builder setScannable(boolean scannable) {
this.scannable = scannable; this.scannable = scannable;