diff options
| author | Wei Wang <weiwa@google.com> | 2014-03-21 00:41:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 00:41:23 +0000 |
| commit | bf0568468da9e02c177abaf9116f9995d53b59aa (patch) | |
| tree | 88bb4e1da2298bba0ec6178e463cc89a7c283b4d | |
| parent | a6454ccbfb5b1f39047f8bac74ec11093469cce2 (diff) | |
| parent | 058061da46db0fdac8ea53c463a6b615fde3e928 (diff) | |
| download | frameworks_base-bf0568468da9e02c177abaf9116f9995d53b59aa.zip frameworks_base-bf0568468da9e02c177abaf9116f9995d53b59aa.tar.gz frameworks_base-bf0568468da9e02c177abaf9116f9995d53b59aa.tar.bz2 | |
am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev
* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
Fix stopBatchedScan not working for wifi
| -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: |