commit 5fbb561060fb3326789acaeea9b543aa1349e1e0
author Lorenzo Colitti <lorenzo@google.com> Tue Sep 20 02:32:55 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 20 02:32:55 2022 +0000
tree a2accb02fe5dc9bff61c5c488009e184f07de999
parent 3fd51ff02a1f13c701756fcd42525d623bec7b25
parent 84afc69b95dee89fd4e7a9567dc3ef8dd56bc385

Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided"

core/java/android/net/Ikev2VpnProfile.java

diff --git a/core/java/android/net/Ikev2VpnProfile.java b/core/java/android/net/Ikev2VpnProfile.java
index 3979c6c..10ce3bf 100644
--- a/core/java/android/net/Ikev2VpnProfile.java
+++ b/core/java/android/net/Ikev2VpnProfile.java
@@ -483,9 +483,6 @@
         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 @@
         }
 
         profile.type = mType;
+        profile.server = getServerAddr();
+        profile.ipsecIdentifier = getUserIdentity();
         profile.setAllowedAlgorithms(mAllowedAlgorithms);
         switch (mType) {
             case TYPE_IKEV2_IPSEC_USER_PASS: