commit 7370ba4f307d95fcc62121a05f6d712d24361e3c
author Chiachang Wang <chiachangwang@google.com> Wed Feb 22 05:58:02 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 22 05:58:02 2023 +0000
tree 38155add339d07eb5348fdf42bab9ebe2ca10979
parent 8c05531a4482841a0b54fcdd8fc8a9e4d4e4f1b6
parent e74c9e41a0d34c9e0d3ddde28ed9e94fcd819a8c

Merge "Update visibility of a constant for testing"

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

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 5d31e40..ab2c002 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 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