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

Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile"

Browse Source
This commit is contained in:
Benedict Wong
2020-03-31 02:22:54 +00:00
committed by Gerrit Code Review
parent e803aa15a4 d0a44f49df
commit 328ef02bf3
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,7 +562,7 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
@NonNull private List<String> mAllowedAlgorithms = new ArrayList<>(); @NonNull private List<String> mAllowedAlgorithms = new ArrayList<>();
private boolean mIsBypassable = false; private boolean mIsBypassable = false;
private boolean mIsMetered = true; private boolean mIsMetered = true;
private int mMaxMtu = 1360; private int mMaxMtu = PlatformVpnProfile.MAX_MTU_DEFAULT;
/** /**
* Creates a new builder with the basic parameters of an IKEv2/IPsec VPN. * Creates a new builder with the basic parameters of an IKEv2/IPsec VPN.

3
core/java/android/net/PlatformVpnProfile.java
View File

@@ -59,6 +59,9 @@ public abstract class PlatformVpnProfile {
public static final int TYPE_IKEV2_IPSEC_PSK = VpnProfile.TYPE_IKEV2_IPSEC_PSK; public static final int TYPE_IKEV2_IPSEC_PSK = VpnProfile.TYPE_IKEV2_IPSEC_PSK;
public static final int TYPE_IKEV2_IPSEC_RSA = VpnProfile.TYPE_IKEV2_IPSEC_RSA; public static final int TYPE_IKEV2_IPSEC_RSA = VpnProfile.TYPE_IKEV2_IPSEC_RSA;
/** @hide */
public static final int MAX_MTU_DEFAULT = 1360;
/** @hide */ /** @hide */
@PlatformVpnType protected final int mType; @PlatformVpnType protected final int mType;

9
core/java/com/android/internal/net/VpnProfile.java
View File

@@ -19,6 +19,7 @@ package com.android.internal.net;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.net.Ikev2VpnProfile; import android.net.Ikev2VpnProfile;
import android.net.PlatformVpnProfile;
import android.net.ProxyInfo; import android.net.ProxyInfo;
import android.os.Build; import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
@@ -131,10 +132,10 @@ public final class VpnProfile implements Cloneable, Parcelable {
* delimiters) are not present in the algorithm names. See {@link #validateAllowedAlgorithms()} * delimiters) are not present in the algorithm names. See {@link #validateAllowedAlgorithms()}
*/ */
private List<String> mAllowedAlgorithms = new ArrayList<>(); // 19 private List<String> mAllowedAlgorithms = new ArrayList<>(); // 19
public boolean isBypassable = false; // 20 public boolean isBypassable = false; // 20
public boolean isMetered = false; // 21 public boolean isMetered = false; // 21
public int maxMtu = 1400; // 22 public int maxMtu = PlatformVpnProfile.MAX_MTU_DEFAULT; // 22
public boolean areAuthParamsInline = false; // 23 public boolean areAuthParamsInline = false; // 23
// Helper fields. // Helper fields.
@UnsupportedAppUsage @UnsupportedAppUsage

2
tests/net/java/com/android/internal/net/VpnProfileTest.java
View File

@@ -65,7 +65,7 @@ public class VpnProfileTest {
assertTrue(p.getAllowedAlgorithms() != null && p.getAllowedAlgorithms().isEmpty()); assertTrue(p.getAllowedAlgorithms() != null && p.getAllowedAlgorithms().isEmpty());
assertFalse(p.isBypassable); assertFalse(p.isBypassable);
assertFalse(p.isMetered); assertFalse(p.isMetered);
assertEquals(1400, p.maxMtu); assertEquals(1360, p.maxMtu);
assertFalse(p.areAuthParamsInline); assertFalse(p.areAuthParamsInline);
} }