diff options
| author | 2017-04-07 06:44:48 +0000 | |
|---|---|---|
| committer | 2017-04-07 06:44:50 +0000 | |
| commit | 7bf58d5975a00bb5ec810e21253e200f6e01c732 (patch) | |
| tree | f8ff07ee0565f82ceae42c860aa8a58e6b5d0f18 | |
| parent | b23fabf3fd0710a5e778f7befec0f962d9e569df (diff) | |
| parent | 010cc95583d6b93bdcc9cf7959f8470d109f8a3d (diff) | |
Merge "Bluetooth 5 fix default AdvertisingSetParameters values"
| -rw-r--r-- | core/java/android/bluetooth/le/AdvertisingSetParameters.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/bluetooth/le/AdvertisingSetParameters.java b/core/java/android/bluetooth/le/AdvertisingSetParameters.java index 7e3715742463..4e9fac3ee22b 100644 --- a/core/java/android/bluetooth/le/AdvertisingSetParameters.java +++ b/core/java/android/bluetooth/le/AdvertisingSetParameters.java @@ -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; |