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

Commit 3c0d514e authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Allow excludeLocalRoutes set only in bypassable profile" am: eaa3fc76... 

Merge "Allow excludeLocalRoutes set only in bypassable profile" am: eaa3fc76 am: e6c1b941 am: 9d00b222

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

Change-Id: Iadb59b8bf40309b8dffd03d28f01606c7423c8f1
parents 984591b4 9d00b222

core/java/android/net/Ikev2VpnProfile.java

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,10 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { 


        // UnmodifiableList doesn't make a defensive copy by default.

        mAllowedAlgorithms = Collections.unmodifiableList(new ArrayList<>(allowedAlgorithms));

        if (excludeLocalRoutes && !isBypassable) {

            throw new IllegalArgumentException(

                    "Vpn should be byassable if excludeLocalRoutes is set");

        }



        mIsBypassable = isBypassable;

        mIsMetered = isMetered;