diff options
| author | 2022-12-21 02:38:25 +0000 | |
|---|---|---|
| committer | 2022-12-21 02:38:25 +0000 | |
| commit | 32dfee3c978724f70824daf77790e012e2abe661 (patch) | |
| tree | cf3e64e93e074dc4a03ef89768c3f125a755710e | |
| parent | e2659b3350bc099e7bc5c7ce56394d6a650c2654 (diff) | |
| parent | e22b680c9cb92bcd6aa82ba6601abda2773e1f28 (diff) | |
Merge "Add KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT in CarrierConfigManager" am: e22b680c9c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2361259
Change-Id: I91cfa202a58eb6adb33e7cd3b9140c4677e103df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/module-lib-current.txt | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index ed2c8eba0ab2..8d5395918015 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -446,6 +446,10 @@ package android.telecom { package android.telephony { + public class CarrierConfigManager { + field public static final String KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT = "min_udp_port_4500_nat_timeout_sec_int"; + } + public abstract class CellSignalStrength { method public static int getNumSignalStrengthLevels(); } diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index d6142f7d1d23..d8c1b57e3eb9 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4308,6 +4308,18 @@ public class CarrierConfigManager { "data_switch_validation_timeout_long"; /** + * The minimum timeout of UDP port 4500 NAT / firewall entries on the Internet PDN of this + * carrier network. This will be used by Android platform VPNs to tune IPsec NAT keepalive + * interval. If this value is too low to provide uninterrupted inbound connectivity, then + * Android system VPNs may indicate to applications that the VPN cannot support long-lived + * TCP connections. + * @hide + */ + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + public static final String KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT = + "min_udp_port_4500_nat_timeout_sec_int"; + + /** * Specifies whether the system should prefix the EAP method to the anonymous identity. * The following prefix will be added if this key is set to TRUE: * EAP-AKA: "0" @@ -9171,6 +9183,7 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_MMI_TWO_DIGIT_NUMBER_PATTERN_STRING_ARRAY, new String[0]); sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, CellSignalStrengthLte.USE_RSRP); + sDefaults.putInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT, 300); // Default wifi configurations. sDefaults.putAll(Wifi.getDefaults()); sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false); |