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

Commit e8760403 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add config to use lower of IPv4/IPv6 MTU values"" am: c4631dca 

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

Change-Id: Ib824a3c982a8dbfafb6b9770bad1a6a1859da568
parents 1f479b99 c4631dca

telephony/java/android/telephony/CarrierConfigManager.java

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

            "call_composer_picture_server_url_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";



    /**

     * Determines the default RTT mode.

     *
@@ -5888,7 +5878,6 @@ public class CarrierConfigManager { 
        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");

        sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);

        sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");

        sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);

        sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);

        sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, true);

        sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0);