commit bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb
author Irfan Sheriff <isheriff@google.com> Fri Dec 03 17:58:17 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 03 17:58:17 2010 -0800
tree b69b622e8c6e4e808986b0c95bb31efa43e7ffdd
parent e2abd103a2d311738ff1dd1e1d9b8e6c52aa870c
parent d69f649eaf265ecee75757f34bb83b6068968e3d

Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread

wifi/java/android/net/wifi/WifiStateTracker.java

diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index 5540174..27e6a72 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -933,10 +933,8 @@
                     resetConnections(true);
                 }
                 // When supplicant dies, kill the DHCP thread
-                if (mDhcpTarget != null) {
-                    mDhcpTarget.getLooper().quit();
-                    mDhcpTarget = null;
-                }
+                mDhcpTarget.getLooper().quit();
+
                 mContext.removeStickyBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
                 if (ActivityManagerNative.isSystemReady()) {
                     intent = new Intent(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
@@ -1407,10 +1405,9 @@
         NetworkUtils.resetConnections(mInterfaceName);
 
         // Stop DHCP
-        if (mDhcpTarget != null) {
-            mDhcpTarget.setCancelCallback(true);
-            mDhcpTarget.removeMessages(EVENT_DHCP_START);
-        }
+        mDhcpTarget.setCancelCallback(true);
+        mDhcpTarget.removeMessages(EVENT_DHCP_START);
+
         if (!NetworkUtils.stopDhcp(mInterfaceName)) {
             Log.e(TAG, "Could not stop DHCP");
         }