Merge "Cleanup SystemReady in the network stack"

This commit is contained in:
Chalard Jean 2019-04-01 23:28:47 +00:00 • committed by Gerrit Code Review
commit 37576c4dde

View file

@ -3738,16 +3738,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
break;
}
case EVENT_SYSTEM_READY: {
for (NetworkAgentInfo nai : mNetworkAgentInfos.values()) {
// Might have been called already in handleRegisterNetworkAgent since
// mSystemReady is set before sending EVENT_SYSTEM_READY, but calling
// this several times is fine.
try {
nai.networkMonitor().notifySystemReady();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
}
mMultipathPolicyTracker.start();
break;
}
@ -5423,15 +5413,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
synchronized (mNetworkForNetId) {
mNetworkForNetId.put(nai.network.netId, nai);
}
synchronized (this) {
if (mSystemReady) {
try {
networkMonitor.notifySystemReady();
} catch (RemoteException e) {
e.rethrowFromSystemServer();
}
}
}
try {
networkMonitor.start();