Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8048f8bb authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Copy isBypassable flag from VpnProfile to VpnConfig" am: 32b24365 

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



Change-Id: Ieb610574626d4920fe7e13027b23cf9fd512e051
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d37883f6 32b24365

services/core/java/com/android/server/connectivity/Vpn.java

+1 −0
Original line number Diff line number Diff line
@@ -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: