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

* commit 'dc8668c8a727a065cbe48c89c900d2fe98e12ab3':
  Wi-Fi: Handle disconnect in middle of DHCP operation

Author: Jean-Baptiste Queru

wifi/java/android/net/wifi/WifiStateMachine.java

@@ -1621,6 +1621,10 @@ private SupplicantState handleSupplicantStateChange(Message message) {
     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
          */