am dc8668c8: am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"

* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3': Wi-Fi: Handle disconnect in middle of DHCP operation
2012-01-27 13:58:03 -08:00
parent 5525a43a9c dc8668c8a7
commit 27d2ab8b27
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
@ -1621,6 +1621,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
         */