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
2012-01-27 21:09:20 -08:00
parent d28ce2140f 27d2ab8b27
commit 0e1ad89ca5
1 changed files with 4 additions and 0 deletions
--- 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
         */