Revert "Unify registration and NM assignment in NAI"
Revert submission 3535182 Reason for revert: <Droidmonitor created revert due to b/404070202.Will be verified through ABTD for standard investigation.> Reverted changes: /q/submissionid:3535182 Change-Id: I65fdaaacb56c8ef227eaf1a0193efe8d332d6473
This commit is contained in:
parent
a5ec9b4112
commit
30fcf820f9
1 changed files with 11 additions and 4 deletions
|
|
@ -9409,6 +9409,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||
nai.getDeclaredCapabilitiesSanitized(mCarrierPrivilegeAuthenticator)));
|
||||
processLinkPropertiesFromAgent(nai, nai.linkProperties);
|
||||
|
||||
nai.onNetworkMonitorCreated(networkMonitor);
|
||||
|
||||
mNetworkAgentInfos.add(nai);
|
||||
synchronized (mNetworkForNetId) {
|
||||
mNetworkForNetId.put(nai.network.getNetId(), nai);
|
||||
|
|
@ -9423,7 +9425,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||
if (nai.isLocalNetwork()) {
|
||||
handleUpdateLocalNetworkConfig(nai, null /* oldConfig */, nai.localNetworkConfig);
|
||||
}
|
||||
nai.notifyRegistered(networkMonitor);
|
||||
nai.notifyRegistered();
|
||||
NetworkInfo networkInfo = nai.networkInfo;
|
||||
updateNetworkInfo(nai, networkInfo);
|
||||
updateVpnUids(nai, null, nai.networkCapabilities);
|
||||
|
|
|
|||
Loading…
Reference in a new issue