Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" am: 5fbb561060

Browse Source 
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>
This commit is contained in:
Lorenzo Colitti
2022-09-20 02:54:11 +00:00
committed by Automerger Merge Worker
parent a728156a2d 5fbb561060
commit 1fb227f17f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/Ikev2VpnProfile.java
View File

@@ -483,9 +483,6 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
final VpnProfile profile = new VpnProfile("" /* Key; value unused by IKEv2VpnProfile(s) */, final VpnProfile profile = new VpnProfile("" /* Key; value unused by IKEv2VpnProfile(s) */,
mIsRestrictedToTestNetworks, mExcludeLocalRoutes, mRequiresInternetValidation, mIsRestrictedToTestNetworks, mExcludeLocalRoutes, mRequiresInternetValidation,
mIkeTunConnParams); mIkeTunConnParams);
profile.server = getServerAddr();
profile.ipsecIdentifier = getUserIdentity();
profile.proxy = mProxyInfo; profile.proxy = mProxyInfo;
profile.isBypassable = mIsBypassable; profile.isBypassable = mIsBypassable;
profile.isMetered = mIsMetered; profile.isMetered = mIsMetered;
@@ -499,6 +496,8 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
} }
profile.type = mType; profile.type = mType;
profile.server = getServerAddr();
profile.ipsecIdentifier = getUserIdentity();
profile.setAllowedAlgorithms(mAllowedAlgorithms); profile.setAllowedAlgorithms(mAllowedAlgorithms);
switch (mType) { switch (mType) {
case TYPE_IKEV2_IPSEC_USER_PASS: case TYPE_IKEV2_IPSEC_USER_PASS: