Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a1afc6d authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge changes I97ba5903,Icd80b368 into rvc-dev am: 7df7129b 

Change-Id: I5f6ac7365512b16597abae5d9f5306a755bb4879
parents d2102054 7df7129b

core/java/android/net/Ikev2VpnProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile { 
        @NonNull private List<String> mAllowedAlgorithms = new ArrayList<>();

        private boolean mIsBypassable = false;

        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.

core/java/android/net/PlatformVpnProfile.java

+3 −0
Original line number Diff line number Diff line
@@ -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_RSA = VpnProfile.TYPE_IKEV2_IPSEC_RSA;



    /** @hide */

    public static final int MAX_MTU_DEFAULT = 1360;



    /** @hide */

    @PlatformVpnType protected final int mType;

core/java/com/android/internal/net/VpnProfile.java

+5 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.internal.net; 
import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.Ikev2VpnProfile;

import android.net.PlatformVpnProfile;

import android.net.ProxyInfo;

import android.os.Build;

import android.os.Parcel;
@@ -133,7 +134,7 @@ public final class VpnProfile implements Cloneable, Parcelable { 
    private List<String> mAllowedAlgorithms = new ArrayList<>(); // 19

    public boolean isBypassable = false;                         // 20

    public boolean isMetered = false;                            // 21

    public int maxMtu = 1400;                                  // 22

    public int maxMtu = PlatformVpnProfile.MAX_MTU_DEFAULT;      // 22

    public boolean areAuthParamsInline = false;                  // 23



    // Helper fields.

tests/net/java/com/android/internal/net/VpnProfileTest.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class VpnProfileTest { 
        assertTrue(p.getAllowedAlgorithms() != null && p.getAllowedAlgorithms().isEmpty());

        assertFalse(p.isBypassable);

        assertFalse(p.isMetered);

        assertEquals(1400, p.maxMtu);

        assertEquals(1360, p.maxMtu);

        assertFalse(p.areAuthParamsInline);

    }