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

Merge "Bluetooth 5 fix default AdvertisingSetParameters values"

Browse Source 
am: 7bf58d5975

Change-Id: Idd2aad81fa1d6cc39d509c1556e8d1f7eb24a3b2
This commit is contained in:
Jakub Pawlowski
2017-04-07 06:57:30 +00:00
committed by android-build-merger
parent 09146fc440 7bf58d5975
commit 909f3b108f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,8 +241,8 @@ public final class AdvertisingSetParameters implements Parcelable {
*/
public static final class Builder {
private boolean connectable = true;
private boolean scannable = true;
private boolean connectable = false;
private boolean scannable = false;
private boolean isLegacy = false;
private boolean isAnonymous = false;
private boolean includeTxPower = false;
@@ -254,10 +254,10 @@ public final class AdvertisingSetParameters implements Parcelable {
/**
* Set whether the advertisement type should be connectable or
* non-connectable.
* Legacy advertisements must be both connectable and scannable. Nonlegacy
* Legacy advertisements can be both connectable and scannable. Non-legacy
* advertisements can be only scannable or only connectable.
* @param connectable Controls whether the advertisment type will be
* connectable (true) or nonconnectable (false).
* connectable (true) or non-connectable (false).
*/
public Builder setConnectable(boolean connectable) {
this.connectable = connectable;
@@ -266,10 +266,10 @@ public final class AdvertisingSetParameters implements Parcelable {
/**
* Set whether the advertisement type should be scannable.
* Legacy advertisements must be both connectable and scannable. Nonlegacy
* Legacy advertisements can be both connectable and scannable. Non-legacy
* advertisements can be only scannable or only connectable.
* @param scannable Controls whether the advertisment type will be
* scannable (true) or nonscannable (false).
* scannable (true) or non-scannable (false).
*/
public Builder setScannable(boolean scannable) {
this.scannable = scannable;