Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f92b78b authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add keys for preferred ESP packets type" am: 06097888 am: 818d36d7... 

Merge "Add keys for preferred ESP packets type" am: 06097888 am: 818d36d7 am: fdc54631 am: 31369b07 am: 6dba2d86

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



Change-Id: Iac1a7f267ba77070203863c6f4ee868592e29cd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 60078e9c 6dba2d86

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0
Original line number Diff line number Diff line
@@ -4443,6 +4443,22 @@ public class CarrierConfigManager { 
    public static final String KEY_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.

     * The following prefix will be added if this key is set to TRUE:
@@ -10176,6 +10192,7 @@ public class CarrierConfigManager { 
        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);

        sDefaults.putInt(KEY_PREFERRED_IKE_PROTOCOL_INT, 0);

        // Default wifi configurations.

        sDefaults.putAll(Wifi.getDefaults());

        sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);