summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-01-27 13:55:56 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-27 13:55:56 -0800
commitdc8668c8a727a065cbe48c89c900d2fe98e12ab3 (patch)
tree7e6d34dabc8056a9746209d8b5ac6de651229a8b
parent64085d03efcd2abf3b8cd64f4e6344a1ece014c3 (diff)
parent9781870491f4f33403f8d518879a88c20180d7cb (diff)
am 97818704: Merge "Wi-Fi: Handle disconnect in middle of DHCP operation"
* commit '9781870491f4f33403f8d518879a88c20180d7cb': 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
*/