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

Commit b9e67709 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add config to use lower of IPv4/IPv6 MTU values" into rvc-qpr-dev am:... 

Merge "Add config to use lower of IPv4/IPv6 MTU values" into rvc-qpr-dev am: 85f5802b am: e90e7998

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

Change-Id: I541af562a596e36332b8476ae6f4232968f55f88
parents 4bb42a67 e90e7998

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Diff line number Diff line
@@ -3932,6 +3932,16 @@ public class CarrierConfigManager { 
    public static final String KEY_DEFAULT_PREFERRED_APN_NAME_STRING =

            "default_preferred_apn_name_string";



    /**

     * For Android 11, provide a temporary solution for OEMs to use the lower of the two MTU values

     * for IPv4 and IPv6 if both are sent.

     * TODO: remove in later release

     *

     * @hide

     */

    public static final String KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED =

            "use_lower_mtu_value_if_both_received";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -4473,6 +4483,7 @@ public class CarrierConfigManager { 
        sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);

        sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);

        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");

        sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);

    }



    /**