summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-01-27 13:36:48 -0800
committer android code review <noreply-gerritcodereview@google.com> 2012-01-27 13:36:49 -0800
commit9781870491f4f33403f8d518879a88c20180d7cb (patch)
tree1fe6a89f64cf0ca41023b493f4c9c81e181678a5
parent12045502c49bfee40d7d3cb806d9b70d3b5d3ed3 (diff)
parent21bd79f51c032782e3d6ccd22c7e236200d28a94 (diff)
Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
-rw-r--r--wifi/java/android/net/wifi/WifiStateMachine.java4
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 82abe3ace9f2..4539c6befbae 100644
--- 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
*/