diff options
| author | Wei Wang <weiwa@google.com> | 2014-03-21 00:37:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-21 00:37:34 +0000 |
| commit | 058061da46db0fdac8ea53c463a6b615fde3e928 (patch) | |
| tree | 29b5f360e8e3fcd49d5aa6353a1e3101b0cbe42b /wifi/java | |
| parent | 49325305905198b9d077ccc784be96e5684e3623 (diff) | |
| parent | d181673e2872ef4f4c47c109880cc9c03d2fd1ec (diff) | |
| download | frameworks_base-058061da46db0fdac8ea53c463a6b615fde3e928.zip frameworks_base-058061da46db0fdac8ea53c463a6b615fde3e928.tar.gz frameworks_base-058061da46db0fdac8ea53c463a6b615fde3e928.tar.bz2 | |
Merge "Fix stopBatchedScan not working for wifi" into klp-dev
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java index 463a3a6..d6b23ae 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3095,7 +3095,11 @@ public class WifiStateMachine extends StateMachine { case CMD_SET_BATCHED_SCAN: if (recordBatchedScanSettings(message.arg1, message.arg2, (Bundle)message.obj)) { - startBatchedScan(); + if (mBatchedScanSettings != null) { + startBatchedScan(); + } else { + stopBatchedScan(); + } } break; case CMD_SET_COUNTRY_CODE: |