diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-12-04 23:45:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-04 23:45:18 -0800 |
| commit | 18cbfecd8ab587fa049dfc668755a6bd6ddb10d9 (patch) | |
| tree | 561530889727024feb1321500f8552b8efea270d /wifi/java/android | |
| parent | 7da1ffc9d2a51ef6120389a06351fd770ab45f46 (diff) | |
| parent | bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb (diff) | |
| download | frameworks_base-18cbfecd8ab587fa049dfc668755a6bd6ddb10d9.zip frameworks_base-18cbfecd8ab587fa049dfc668755a6bd6ddb10d9.tar.gz frameworks_base-18cbfecd8ab587fa049dfc668755a6bd6ddb10d9.tar.bz2 | |
am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit 'bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb':
DO NOT MERGE Avoid nullifying dhcp target
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index b59279f..bf2d033 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -934,10 +934,8 @@ public class WifiStateTracker extends NetworkStateTracker { 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); @@ -1408,10 +1406,9 @@ public class WifiStateTracker extends NetworkStateTracker { 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"); } |