summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2015-04-30 07:08:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-30 07:08:43 +0000
commit05a419aed54da30999a3831d8da6e2e72f85bd40 (patch)
tree94e4d85970145bbb683757033a47b74bd308e7de /core/java/android
parent7230bdf23bf905a60ac2c209f04fcf83264fec56 (diff)
parentfc9f2d71a6ea6cc2f3b4490b4a4db6cac01cfad4 (diff)
downloadframeworks_base-05a419aed54da30999a3831d8da6e2e72f85bd40.zip
frameworks_base-05a419aed54da30999a3831d8da6e2e72f85bd40.tar.gz
frameworks_base-05a419aed54da30999a3831d8da6e2e72f85bd40.tar.bz2
Merge "Temp workaround to track max beacons." into mnc-dev
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/bluetooth/le/ScanSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/bluetooth/le/ScanSettings.java b/core/java/android/bluetooth/le/ScanSettings.java
index f103cae..123514e 100644
--- a/core/java/android/bluetooth/le/ScanSettings.java
+++ b/core/java/android/bluetooth/le/ScanSettings.java
@@ -236,7 +236,7 @@ public final class ScanSettings implements Parcelable {
private int mScanResultType = SCAN_RESULT_TYPE_FULL;
private long mReportDelayMillis = 0;
private int mMatchMode = MATCH_MODE_AGGRESSIVE;
- private int mNumOfMatchesPerFilter = MATCH_NUM_ONE_ADVERTISEMENT;
+ private int mNumOfMatchesPerFilter = MATCH_NUM_MAX_ADVERTISEMENT;
/**
* Set scan mode for Bluetooth LE scan.
*