summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/le/ScanSettings.java
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2015-05-01 09:19:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-01 09:19:54 +0000
commit6dabd5279f960318faf80001639c72af10230622 (patch)
tree4d1498eb4293054310e7dfd4136ff63aee2e6b33 /framework/java/android/bluetooth/le/ScanSettings.java
parent26452df301fe90628222233b84b4a4b6c44658cb (diff)
parent3bc6c8fdc79e78df21ed80c97eb5445b4b66079e (diff)
am 17004d63: am 342c22a5: am 3bc6c8fd: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
* commit '17004d636712c092d7ac8fdfcf933572481cebfb': Fix a bug in ScanSettings constructor.
Diffstat (limited to 'framework/java/android/bluetooth/le/ScanSettings.java')
-rw-r--r--framework/java/android/bluetooth/le/ScanSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/java/android/bluetooth/le/ScanSettings.java b/framework/java/android/bluetooth/le/ScanSettings.java
index 123514eb93..dad486dd94 100644
--- a/framework/java/android/bluetooth/le/ScanSettings.java
+++ b/framework/java/android/bluetooth/le/ScanSettings.java
@@ -187,7 +187,7 @@ public final class ScanSettings implements Parcelable {
mScanResultType = scanResultType;
mReportDelayMillis = reportDelayMillis;
mNumOfMatchesPerFilter = numOfMatchesPerFilter;
- mMatchMode = numOfMatchesPerFilter;
+ mMatchMode = matchMode;
}
private ScanSettings(Parcel in) {