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

Merge "Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am: 32b2436597 am: 8048f8bbe9 am: ffda7e441b" into tm-d1-dev-plus-aosp am: 1378c0d23a

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

Change-Id: I7938cb2c323a482d802226b56335f203f734ac8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2022-08-19 10:50:56 +00:00
parent f8a36e3fb1 1378c0d23a
commit 80cca04121
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4040,6 +4040,7 @@ public class Vpn {
mConfig.proxyInfo = profile.proxy;
mConfig.requiresInternetValidation = profile.requiresInternetValidation;
mConfig.excludeLocalRoutes = profile.excludeLocalRoutes;
mConfig.allowBypass = profile.isBypassable;
switch (profile.type) {
case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS: