diff options
| author | 2022-09-20 02:54:11 +0000 | |
|---|---|---|
| committer | 2022-09-20 02:54:11 +0000 | |
| commit | 1fb227f17f73e6ce40e7df2292bc416ada325a56 (patch) | |
| tree | caee54c6d7ce40db27af51d872389e5954f8239a | |
| parent | a728156a2d1a7c5e685847d1871f0ddc402cc1d6 (diff) | |
| parent | 5fbb561060fb3326789acaeea9b543aa1349e1e0 (diff) | |
Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200482
Change-Id: I85429b3c686b66cf7ae17e5fc6c4bb18007deffe
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: |