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

* commit '058061da46db0fdac8ea53c463a6b615fde3e928':
  Fix stopBatchedScan not working for wifi
This commit is contained in:
Wei Wang
2014-03-21 00:41:23 +00:00
committed by Android Git Automerger

View File

@@ -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: