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

Merge "Set underlying networks into NetworkCapabilities directly" am: 528c63e564 am: 8e0a1d95ec am: df78a4ecb0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829954

Change-Id: I72592bcff4f003ef1406cab0e271eab35ef07116
This commit is contained in:
Lucas Lin
2021-10-21 10:18:29 +00:00
committed by Automerger Merge Worker
parent 77af314c76 df78a4ecb0
commit 24e87feb73
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

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