summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@android.com>2012-12-05 09:25:43 -0800
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-12-05 09:25:43 -0800
commitc602187e51aa6e8c46bffa5fb2603e368d83ea95 (patch)
tree5fad1ab92f8e7ffa1f88ad3e56c9a3e84d842b08 /wifi
parent40627de3044c4a23c20c2229cab20aab21ff2b03 (diff)
parentd7fc38cead0d1da007834214eba102b294f7923c (diff)
downloadframeworks_base-c602187e51aa6e8c46bffa5fb2603e368d83ea95.zip
frameworks_base-c602187e51aa6e8c46bffa5fb2603e368d83ea95.tar.gz
frameworks_base-c602187e51aa6e8c46bffa5fb2603e368d83ea95.tar.bz2
Merge "Prevent scanning during DHCP process"
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 9898b53..8a22e96 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -3412,6 +3412,10 @@ public class WifiStateMachine extends StateMachine {
case CMD_SET_HIGH_PERF_MODE:
deferMessage(message);
break;
+ /* Defer scan request since we should not switch to other channels at DHCP */
+ case CMD_START_SCAN:
+ deferMessage(message);
+ break;
default:
return NOT_HANDLED;
}