diff options
| author | Irfan Sheriff <isheriff@android.com> | 2012-12-06 10:44:03 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-12-06 10:44:03 -0800 |
| commit | 88b41a589d38f7d230e9290e337fb8cb99c36c2e (patch) | |
| tree | 5e4380a794782dc556a22e8522393df7995b8962 /wifi/java/android | |
| parent | 4bef5ac8c7ee231678e679aba6ed80715590580c (diff) | |
| parent | 46e380795216c58acbd38af532ac1626e105866a (diff) | |
| download | frameworks_base-88b41a589d38f7d230e9290e337fb8cb99c36c2e.zip frameworks_base-88b41a589d38f7d230e9290e337fb8cb99c36c2e.tar.gz frameworks_base-88b41a589d38f7d230e9290e337fb8cb99c36c2e.tar.bz2 | |
am 46e38079: am c602187e: Merge "Prevent scanning during DHCP process"
* commit '46e380795216c58acbd38af532ac1626e105866a':
Prevent scanning during DHCP process
Diffstat (limited to 'wifi/java/android')
| -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 abd55fa..0a61972 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -3366,6 +3366,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; } |