commit bf0568468da9e02c177abaf9116f9995d53b59aa
author Wei Wang <weiwa@google.com> Fri Mar 21 00:41:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 21 00:41:23 2014 +0000
tree 88bb4e1da2298bba0ec6178e463cc89a7c283b4d
parent a6454ccbfb5b1f39047f8bac74ec11093469cce2
parent 058061da46db0fdac8ea53c463a6b615fde3e928

am 058061da: Merge "Fix stopBatchedScan not working for wifi" into klp-dev

* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
  Fix stopBatchedScan not working for wifi

wifi/java/android/net/wifi/WifiStateMachine.java

diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 463a3a63..d6b23ae 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -3095,7 +3095,11 @@
                 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: