summaryrefslogtreecommitdiffstats
path: root/core/java/android
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
commit3af0a8e48db12d68a646b78dce84434a18aa06ab (patch)
treec2dd3b1934c41cc9a40801315900d98ab3f6bd2e /core/java/android
parentcdc8a8bf5bad8d21a95df0441d793e2b8f504816 (diff)
parent17004d636712c092d7ac8fdfcf933572481cebfb (diff)
downloadframeworks_base-3af0a8e48db12d68a646b78dce84434a18aa06ab.zip
frameworks_base-3af0a8e48db12d68a646b78dce84434a18aa06ab.tar.gz
frameworks_base-3af0a8e48db12d68a646b78dce84434a18aa06ab.tar.bz2
am 17004d63: am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
* commit '17004d636712c092d7ac8fdfcf933572481cebfb': Fix a bug in ScanSettings constructor.
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 123514e..dad486d 100644
--- a/core/java/android/bluetooth/le/ScanSettings.java
+++ b/core/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) {