am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread (18cbfecd) · Commits · e / os / android_frameworks_base

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

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -934,10 +934,8 @@ public class WifiStateTracker extends NetworkStateTracker {
	resetConnections(true);		resetConnections(true);
	}		}
	// When supplicant dies, kill the DHCP thread		// When supplicant dies, kill the DHCP thread
	if (mDhcpTarget != null) {
	mDhcpTarget.getLooper().quit();		mDhcpTarget.getLooper().quit();
	mDhcpTarget = null;
	}
	mContext.removeStickyBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));		mContext.removeStickyBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
	if (ActivityManagerNative.isSystemReady()) {		if (ActivityManagerNative.isSystemReady()) {
	intent = new Intent(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);		intent = new Intent(WifiManager.SUPPLICANT_CONNECTION_CHANGE_ACTION);
	@@ -1408,10 +1406,9 @@ public class WifiStateTracker extends NetworkStateTracker {
	NetworkUtils.resetConnections(mInterfaceName);		NetworkUtils.resetConnections(mInterfaceName);

	// Stop DHCP		// Stop DHCP
	if (mDhcpTarget != null) {
	mDhcpTarget.setCancelCallback(true);		mDhcpTarget.setCancelCallback(true);
	mDhcpTarget.removeMessages(EVENT_DHCP_START);		mDhcpTarget.removeMessages(EVENT_DHCP_START);
	}
	if (!NetworkUtils.stopDhcp(mInterfaceName)) {		if (!NetworkUtils.stopDhcp(mInterfaceName)) {
	Log.e(TAG, "Could not stop DHCP");		Log.e(TAG, "Could not stop DHCP");
	}		}