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

Commit e2494469 authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" into tm-qpr-dev

parents f60a9151 2ed1cda8

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: