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

Merge "Add keys for preferred ESP packets type" am: 0609788851 am: 818d36d7b1

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

Change-Id: I55e220e0c33d0d3849d8656bf834afa0415c985f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-03-20 03:52:57 +00:00
committed by Automerger Merge Worker
parent b9b657f586 818d36d7b1
commit fdc54631e1
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4333,6 +4333,22 @@ public class CarrierConfigManager {
public static final String KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT = public static final String KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT =
"min_udp_port_4500_nat_timeout_sec_int"; "min_udp_port_4500_nat_timeout_sec_int";
/**
* The preferred IKE protocol for ESP packets.
*
* This will be used by Android platform VPNs to select preferred encapsulation type and IP
* protocol type. The possible customization values are:
*
* AUTO IP VERSION and ENCAPSULATION TYPE SELECTION : "0"
* IPv4 UDP : "40"
* IPv6 ESP : "61"
*
* See the {@code PREFERRED_IKE_PROTOCOL_} constants in
* {@link com.android.server.connectivity.Vpn}.
* @hide
*/
public static final String KEY_PREFERRED_IKE_PROTOCOL_INT = "preferred_ike_protocol_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:
@@ -9256,6 +9272,7 @@ public class CarrierConfigManager {
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); sDefaults.putInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT, 300);
sDefaults.putInt(KEY_PREFERRED_IKE_PROTOCOL_INT, 0);
// 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);