Merge "Cleanup SystemReady in the network stack"
This commit is contained in:
@@ -3738,16 +3738,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case EVENT_SYSTEM_READY: {
|
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();
|
mMultipathPolicyTracker.start();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -5423,15 +5413,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
|
|||||||
synchronized (mNetworkForNetId) {
|
synchronized (mNetworkForNetId) {
|
||||||
mNetworkForNetId.put(nai.network.netId, nai);
|
mNetworkForNetId.put(nai.network.netId, nai);
|
||||||
}
|
}
|
||||||
synchronized (this) {
|
|
||||||
if (mSystemReady) {
|
|
||||||
try {
|
|
||||||
networkMonitor.notifySystemReady();
|
|
||||||
} catch (RemoteException e) {
|
|
||||||
e.rethrowFromSystemServer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
networkMonitor.start();
|
networkMonitor.start();
|
||||||
|
|||||||
Reference in New Issue
Block a user