joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Unify registration and NM assignment in NAI

Browse source 
Registration is marked by the creation of the network monitor
for a given network agent. This patch makes this fact much
more ovbious.

Test: CtsNetTests ConnectivityCoverageTests
Change-Id: I94a56b2bce6f453322b1eb91d6a6f14b31e7a95f
This commit is contained in:
Chalard Jean 2025-03-10 14:15:17 +09:00
commit 2e2f5faecd
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
service/src/com/android/server/ConnectivityService.java
View file

@ -9409,8 +9409,6 @@ 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);
@ -9425,7 +9423,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (nai.isLocalNetwork()) {
handleUpdateLocalNetworkConfig(nai, null /* oldConfig */, nai.localNetworkConfig);
}
nai.notifyRegistered();
nai.notifyRegistered(networkMonitor);
NetworkInfo networkInfo = nai.networkInfo;
updateNetworkInfo(nai, networkInfo);
updateVpnUids(nai, null, nai.networkCapabilities);