LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid NDC deadlock when re-arming network alert.

Browse Source 
When NDC delivers limitReached() event, NMS re-arms the alert, which
makes another call back to NDC.  If NDC already started processing
another call, this causes deadlock.

Fix this by re-arming on a handler thread.

Bug: 5879848
Change-Id: I46fa78fe1f1122c5f31dd6020483e5ae89a9f39d
This commit is contained in:
Jeff Sharkey
2012-02-02 13:07:47 -08:00
parent 2ed12477de
commit 9a21249a6c
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/net/NetworkStatsService.java
View File

@@ -121,6 +121,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
private static final int MSG_PERFORM_POLL = 1; private static final int MSG_PERFORM_POLL = 1;
private static final int MSG_UPDATE_IFACES = 2; private static final int MSG_UPDATE_IFACES = 2;
private static final int MSG_REGISTER_GLOBAL_ALERT = 3;
/** Flags to control detail level of poll event. */ /** Flags to control detail level of poll event. */
private static final int FLAG_PERSIST_NETWORK = 0x1; private static final int FLAG_PERSIST_NETWORK = 0x1;
@@ -600,7 +601,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mHandler.obtainMessage(MSG_PERFORM_POLL, flags, 0).sendToTarget(); mHandler.obtainMessage(MSG_PERFORM_POLL, flags, 0).sendToTarget();
// re-arm global alert for next update // re-arm global alert for next update
registerGlobalAlert(); mHandler.obtainMessage(MSG_REGISTER_GLOBAL_ALERT).sendToTarget();
} }
} }
}; };
@@ -951,6 +952,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
updateIfaces(); updateIfaces();
return true; return true;
} }
case MSG_REGISTER_GLOBAL_ALERT: {
registerGlobalAlert();
return true;
}
default: { default: {
return false; return false;
} }