From 010cc95583d6b93bdcc9cf7959f8470d109f8a3d Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Thu, 6 Apr 2017 07:22:57 -0700 Subject: [PATCH] Bluetooth 5 fix default AdvertisingSetParameters values Having advertiser be scannable and connectable by default is a bad choice for new advertising set. Bug: 30622771 Test: sl4a Bt5ScanTest Change-Id: I4fc270e78ca4e62d3077c5cd28aa59b0518d2e77 --- .../bluetooth/le/AdvertisingSetParameters.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/android/bluetooth/le/AdvertisingSetParameters.java b/core/java/android/bluetooth/le/AdvertisingSetParameters.java index 7e37157424631..4e9fac3ee22b2 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;