diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-27 21:09:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-27 21:09:20 -0800 |
| commit | 0e1ad89ca5487babb39c52abcff9da41e0b84462 (patch) | |
| tree | 2865e397d6c58ec191a74692fd6d65c611e1c17a | |
| parent | d28ce2140f060f020712efe687b1183b1e1c47ca (diff) | |
| parent | 27d2ab8b27e7e1927e18869e898fa556e5da3d43 (diff) | |
| download | frameworks_base-0e1ad89ca5487babb39c52abcff9da41e0b84462.zip frameworks_base-0e1ad89ca5487babb39c52abcff9da41e0b84462.tar.gz frameworks_base-0e1ad89ca5487babb39c52abcff9da41e0b84462.tar.bz2 | |
am 27d2ab8b: am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '27d2ab8b27e7e1927e18869e898fa556e5da3d43':
Wi-Fi: Handle disconnect in middle of DHCP operation
| -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 8c9e472..b8b7c0e 100644 --- a/wifi/java/android/net/wifi/WifiStateMachine.java +++ b/wifi/java/android/net/wifi/WifiStateMachine.java @@ -1625,6 +1625,10 @@ public class WifiStateMachine extends StateMachine { private void handleNetworkDisconnect() { if (DBG) log("Stopping DHCP and clearing IP"); + /* In case we were in middle of DHCP operation + restore back powermode */ + handlePostDhcpSetup(); + /* * stop DHCP */ |