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

Commit adcf909b authored by Hall Liu's avatar Hall Liu Committed by Automerger Merge Worker
Browse files

resolve merge conflicts of 869fe2b5 to... 

resolve merge conflicts of 869fe2b5 to rvc-qpr-dev-plus-aosp am: 6ef67bbd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e40e7daabce0d44e436bed2b7ac6e3631df64a2
parents 35aa9d14 6ef67bbd

telephony/java/android/telephony/CarrierConfigManager.java

+13 −0
Original line number Diff line number Diff line
@@ -4637,6 +4637,18 @@ public class CarrierConfigManager { 
    public static final String KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED =

            "use_lower_mtu_value_if_both_received";



    /**

     * Determines the default RTT mode.

     *

     * Upon first boot, when the user has not yet set a value for their preferred RTT mode,

     * the value of this config will be sent to the IMS stack. Valid values are the same as for

     * {@link Settings.Secure#RTT_CALLING_MODE}.

     *

     * @hide

     */

    public static final String KEY_DEFAULT_RTT_MODE_INT =

            "default_rtt_mode_int";



    /**

     * Indicates if auto-configuration server is used for the RCS config

     * Reference: GSMA RCC.14
@@ -5201,6 +5213,7 @@ public class CarrierConfigManager { 
        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, false);

        sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0);

    }



    /**