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

Commit 5999bc26 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am:... 

Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb5610 am: 1fb227f1 am: 788c6cc5 am: 7e87ea06

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



Change-Id: If0792139c092dd699c4bf1612297f795c8a53a24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 37453749 7e87ea06

core/java/android/net/Ikev2VpnProfile.java

+2 −3
Original line number Diff line number Diff line
@@ -483,9 +483,6 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { 
        final VpnProfile profile = new VpnProfile("" /* Key; value unused by IKEv2VpnProfile(s) */,

                mIsRestrictedToTestNetworks, mExcludeLocalRoutes, mRequiresInternetValidation,

                mIkeTunConnParams);



        profile.server = getServerAddr();

        profile.ipsecIdentifier = getUserIdentity();

        profile.proxy = mProxyInfo;

        profile.isBypassable = mIsBypassable;

        profile.isMetered = mIsMetered;
@@ -499,6 +496,8 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { 
        }



        profile.type = mType;

        profile.server = getServerAddr();

        profile.ipsecIdentifier = getUserIdentity();

        profile.setAllowedAlgorithms(mAllowedAlgorithms);

        switch (mType) {

            case TYPE_IKEV2_IPSEC_USER_PASS: