Merge "Cleanup SystemReady in the network stack" am: ff23b6dce0

am: c1e58995da

Change-Id: Id1348ffa1406adf08b94eec18b3b1e6da40e84be
This commit is contained in:
Chalard Jean
2019-04-01 17:41:35 -07:00
committed by android-build-merger

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();