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

This commit is contained in:
Automerger Merge Worker
2022-08-19 10:19:37 +00:00
committed by Android (Google) Code Review

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: