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

Commit 13f82c22 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Update visibility of a constant for testing" am: 7370ba4f am:... 

Merge "Update visibility of a constant for testing" am: 7370ba4f am: c9ff47be am: 00ef27d4 am: 61080fce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2445829



Change-Id: I0617fe1a18e53b123e13d958e44e9667cf6b992d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b189377b 61080fce

services/core/java/com/android/server/connectivity/Vpn.java

+2 −1
Original line number Diff line number Diff line
@@ -258,7 +258,8 @@ public class Vpn { 
    public static final int AUTOMATIC_KEEPALIVE_DELAY_SECONDS = 30;



    // Default keepalive timeout for carrier config is 5 minutes. Mimic this.

    private static final int DEFAULT_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT = 5 * 60;

    @VisibleForTesting

    static final int DEFAULT_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT = 5 * 60;



    // TODO: create separate trackers for each unique VPN to support

    // automated reconnection