diff options
| author | Wei Wang <weiwa@google.com> | 2014-03-21 00:45:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 00:45:42 +0000 |
| commit | f479d15814f58ed820829fef0bfadf73cb2b88aa (patch) | |
| tree | 67800c5c6d2ad71e90aeec92f8567d968726160e /wifi/java | |
| parent | 1c84e98fc482f75a7ed4373a22096cd447bc55f9 (diff) | |
| parent | bf0568468da9e02c177abaf9116f9995d53b59aa (diff) | |
| download | frameworks_base-f479d15814f58ed820829fef0bfadf73cb2b88aa.zip frameworks_base-f479d15814f58ed820829fef0bfadf73cb2b88aa.tar.gz frameworks_base-f479d15814f58ed820829fef0bfadf73cb2b88aa.tar.bz2 | |
am bf056846: am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit 'bf0568468da9e02c177abaf9116f9995d53b59aa':
Fix stopBatchedScan not working for wifi
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 67307d5..0fffd37 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3096,7 +3096,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: |