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

Merge "Update visibility of a constant for testing" am: 7370ba4f30 am: c9ff47bea2 am: 00ef27d47e

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

Change-Id: Ie5b7353366671f3178198e2998085bedf40253ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-02-22 08:54:36 +00:00
committed by Automerger Merge Worker
parent fcb2bb5183 00ef27d47e
commit 61080fcedc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -258,7 +258,8 @@ public class Vpn {
public static final int AUTOMATIC_KEEPALIVE_DELAY_SECONDS = 30; public static final int AUTOMATIC_KEEPALIVE_DELAY_SECONDS = 30;
// Default keepalive timeout for carrier config is 5 minutes. Mimic this. // 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 // TODO: create separate trackers for each unique VPN to support
// automated reconnection // automated reconnection