Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread

Browse Source 
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
  DO NOT MERGE Avoid nullifying dhcp target
This commit is contained in:
Irfan Sheriff
2010-12-04 23:45:18 -08:00
committed by Android Git Automerger
parent 7da1ffc9d2 bd3dd73b36
commit 18cbfecd8a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wifi/java/android/net/wifi/WifiStateTracker.java
View File

@@ -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");
} }