diff options
| author | Wei Wang <weiwa@google.com> | 2015-05-01 08:48:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-01 08:48:14 +0000 |
| commit | 17004d636712c092d7ac8fdfcf933572481cebfb (patch) | |
| tree | 074fb04f74f834bbfd2d0c73eda0feafffbb8e23 /core/java/android | |
| parent | cf6f4e4e4d1a6e13ac7919b03d2561bc54b9f679 (diff) | |
| parent | 342c22a5973386d5a5fdb0b552a26f51920cb026 (diff) | |
| download | frameworks_base-17004d636712c092d7ac8fdfcf933572481cebfb.zip frameworks_base-17004d636712c092d7ac8fdfcf933572481cebfb.tar.gz frameworks_base-17004d636712c092d7ac8fdfcf933572481cebfb.tar.bz2 | |
am 342c22a5: am f2cfe6c0: Merge "Fix a bug in ScanSettings constructor." into mnc-dev
* commit '342c22a5973386d5a5fdb0b552a26f51920cb026':
Fix a bug in ScanSettings constructor.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/bluetooth/le/ScanSettings.java | 2 |
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) { |