summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2014-03-20 16:27:01 -0700
committerWei Wang <weiwa@google.com>2014-03-20 17:05:42 -0700
commitd181673e2872ef4f4c47c109880cc9c03d2fd1ec (patch)
treeac682c194103e28ba0d1c8c65a7c857781681a78
parentd16505da8676b54dd354da278b1888f28257028b (diff)
downloadbase-d181673e2872ef4f4c47c109880cc9c03d2fd1ec.tar.gz
Fix stopBatchedScan not working for wifi
Change-Id: I011747da2a98cbed76a8fc6716f0c539c65f2804
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java6
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 3dda56a434de..02884bd564b6 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -3092,7 +3092,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: