diff options
| author | 2023-02-22 07:41:45 +0000 | |
|---|---|---|
| committer | 2023-02-22 07:41:45 +0000 | |
| commit | 00ef27d47e7fba87f9bb4423db12bcd4d8cd656a (patch) | |
| tree | a189db902d500f2997e6d63eaefa2893f9c1e5d8 | |
| parent | a5bd452e53afaaf29b3ad6f027811b78b84e5c2c (diff) | |
| parent | c9ff47bea25b1aaa7e7246ecfc07f1b80e4930b8 (diff) | |
Merge "Update visibility of a constant for testing" am: 7370ba4f30 am: c9ff47bea2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2445829
Change-Id: I984b545f74df76edfcad617a1d89345130a2348e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/connectivity/Vpn.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java index 5d31e40ad9d3..ab2c002c2b24 100644 --- a/services/core/java/com/android/server/connectivity/Vpn.java +++ b/services/core/java/com/android/server/connectivity/Vpn.java @@ -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 |