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

2012-01-27 13:36:48 -08:00
parent 12045502c4 21bd79f51c
commit 9781870491
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
         */