Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am: 32b2436597 am: 8048f8bbe9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2189315 Change-Id: Ib82f18a9394affd69d5cbc078e158017f1db37d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user