Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set underlying networks into NetworkCapabilities directly

Browse Source 
The constructor of NetworkAgentInfo will refer to the underlying
networks of NetworkCapabilities and set declaredUnderlyingNetworks
directly, so there is no need to call setUnderlyingNetworks() to
update declaredUnderlyingNetworks.

Bug: 191918368
Test: atest FrameworksNetTests:ConnectivityServiceTest
Change-Id: Idb5f0232455603567d02591b0cdbab4764155ee9
This commit is contained in:
lucaslin
2021-09-17 19:48:46 +08:00
parent c39842abd9
commit c7b5ac035e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1268,6 +1268,9 @@ public class Vpn {
capsBuilder.addCapability(NET_CAPABILITY_NOT_METERED);
}
capsBuilder.setUnderlyingNetworks((mConfig.underlyingNetworks != null)
? Arrays.asList(mConfig.underlyingNetworks) : null);
mNetworkCapabilities = capsBuilder.build();
mNetworkAgent = new NetworkAgent(mContext, mLooper, NETWORKTYPE /* logtag */,
mNetworkCapabilities, lp,
@@ -1288,8 +1291,6 @@ public class Vpn {
} finally {
Binder.restoreCallingIdentity(token);
}
mNetworkAgent.setUnderlyingNetworks((mConfig.underlyingNetworks != null)
? Arrays.asList(mConfig.underlyingNetworks) : null);
updateState(DetailedState.CONNECTED, "agentConnect");
}