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

Merge "Add KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT in CarrierConfigManager" am: e22b680c9c

Browse Source 
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>
This commit is contained in:
Chiachang Wang
2022-12-21 02:38:25 +00:00
committed by Automerger Merge Worker
parent e2659b3350 e22b680c9c
commit 32dfee3c97
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/module-lib-current.txt
View File

@@ -446,6 +446,10 @@ package android.telecom {
package android.telephony { 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 { public abstract class CellSignalStrength {
method public static int getNumSignalStrengthLevels(); method public static int getNumSignalStrengthLevels();
} }

13
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -4307,6 +4307,18 @@ public class CarrierConfigManager {
public static final String KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG = public static final String KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG =
"data_switch_validation_timeout_long"; "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. * 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: * The following prefix will be added if this key is set to TRUE:
@@ -9171,6 +9183,7 @@ public class CarrierConfigManager {
sDefaults.putStringArray(KEY_MMI_TWO_DIGIT_NUMBER_PATTERN_STRING_ARRAY, new String[0]); sDefaults.putStringArray(KEY_MMI_TWO_DIGIT_NUMBER_PATTERN_STRING_ARRAY, new String[0]);
sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,
CellSignalStrengthLte.USE_RSRP); CellSignalStrengthLte.USE_RSRP);
sDefaults.putInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT, 300);
// Default wifi configurations. // Default wifi configurations.
sDefaults.putAll(Wifi.getDefaults()); sDefaults.putAll(Wifi.getDefaults());
sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false); sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);