From 84afc69b95dee89fd4e7a9567dc3ef8dd56bc385 Mon Sep 17 00:00:00 2001 From: chiachangwang Date: Thu, 1 Sep 2022 01:26:36 +0000 Subject: Skip duplicate parameters when IkeTunnelConnectionParams provided For those fields existing in the IkeTunnelConnectionParams, the value should be retrieved from the object to honor the setting in the object. IkeTunnelConnectionParams are serialized in a safe manner to ensure that they do not conflict with the serialization scheme of VpnProfile. However, copying some of these fields(e.g. IkeKeyId) may conflict with the serialization scheme. Bug: 243718982 Test: atest FrameworksNetTests CtsNetTestCases Change-Id: I510c47e26feabd5cebe9497ef495e4d729d0f7c6 --- core/java/android/net/Ikev2VpnProfile.java | 5 ++--- 1 file 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: -- cgit v1.2.3-59-g8ed1b