Merge "Add keys for preferred ESP packets type" (06097888) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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);