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

Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" into tm-qpr-dev

Browse Source
This commit is contained in:
Chiachang Wang
2022-09-21 00:30:18 +00:00
committed by Android (Google) Code Review
parent f60a915197 2ed1cda859
commit e24944690f
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) */,
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: