diff options
| author | 2022-09-20 12:33:05 +0000 | |
|---|---|---|
| committer | 2022-09-20 12:33:05 +0000 | |
| commit | 7e87ea0629e97e57e3c514fca3df73447c230c9a (patch) | |
| tree | 5836c8ed49ca6e8d7d3d5b7d2360c278394775ad | |
| parent | 3a47e2f6e91f4c27e8ec1a149167a6407a21c1e7 (diff) | |
| parent | 788c6cc56314db8f58536265e854df90b03aa8b8 (diff) | |
Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060 am: 1fb227f17f am: 788c6cc563
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200482
Change-Id: I44241f7a8e71846cf2067693006505fc326ec736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/net/Ikev2VpnProfile.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/net/Ikev2VpnProfile.java b/core/java/android/net/Ikev2VpnProfile.java index 3979c6c78dcb..10ce3bf78b2a 100644 --- a/core/java/android/net/Ikev2VpnProfile.java +++ b/core/java/android/net/Ikev2VpnProfile.java @@ -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: |