diff options
| author | Irfan Sheriff <isheriff@android.com> | 2012-12-06 10:39:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-06 10:39:04 -0800 |
| commit | 46e380795216c58acbd38af532ac1626e105866a (patch) | |
| tree | dcfc7fe7ec9128fa2282e4717ffadab2e56895fa /wifi/java | |
| parent | 08500d5741ae5b21a397957cfb441787f0224d77 (diff) | |
| parent | c602187e51aa6e8c46bffa5fb2603e368d83ea95 (diff) | |
| download | frameworks_base-46e380795216c58acbd38af532ac1626e105866a.zip frameworks_base-46e380795216c58acbd38af532ac1626e105866a.tar.gz frameworks_base-46e380795216c58acbd38af532ac1626e105866a.tar.bz2 | |
am c602187e: Merge "Prevent scanning during DHCP process"
* commit 'c602187e51aa6e8c46bffa5fb2603e368d83ea95':
Prevent scanning during DHCP process
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateMachine.java | 4 |
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; } |