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

DO NOT MERGE Avoid nullifying dhcp target

Browse Source 
A race condition causes an NPE on mDhcpTarget. The safest change is
to avoid nullifying it. A dummy call to remove messages
on a handler whose looper is quit should do no harm.

Bug: 3191203
Change-Id: I7613a5add873ce9512e9719cb2dc8da61255370e
This commit is contained in:
Irfan Sheriff
2010-12-03 09:59:07 -08:00
parent 3591bebd59
commit d69f649eaf
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

@@ -933,10 +933,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);
@@ -1407,10 +1405,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");
}