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

Commit 923d7d28 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge "Allow carriers to configure RTT while roaming"

parents 4f278834 d20b2a01

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -39581,6 +39581,7 @@ package android.telephony { 
    field public static final String KEY_RTT_DOWNGRADE_SUPPORTED_BOOL = "rtt_downgrade_supported_bool";

    field public static final String KEY_RTT_DOWNGRADE_SUPPORTED_BOOL = "rtt_downgrade_supported_bool";

    field public static final String KEY_RTT_SUPPORTED_BOOL = "rtt_supported_bool";

    field public static final String KEY_RTT_SUPPORTED_BOOL = "rtt_supported_bool";

    field public static final String KEY_RTT_SUPPORTED_FOR_VT_BOOL = "rtt_supported_for_vt_bool";

    field public static final String KEY_RTT_SUPPORTED_FOR_VT_BOOL = "rtt_supported_for_vt_bool";

    field public static final String KEY_RTT_SUPPORTED_WHILE_ROAMING_BOOL = "rtt_supported_while_roaming";

    field public static final String KEY_RTT_UPGRADE_SUPPORTED_BOOL = "rtt_upgrade_supported_bool";

    field public static final String KEY_RTT_UPGRADE_SUPPORTED_BOOL = "rtt_upgrade_supported_bool";

    field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";

    field public static final String KEY_SHOW_4G_FOR_3G_DATA_ICON_BOOL = "show_4g_for_3g_data_icon_bool";

    field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";

    field public static final String KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+7 −0
Original line number Original line Diff line number Diff line
@@ -4112,6 +4112,12 @@ public class CarrierConfigManager { 
    public static final String KEY_DEFAULT_RTT_MODE_INT =

    public static final String KEY_DEFAULT_RTT_MODE_INT =

            "default_rtt_mode_int";

            "default_rtt_mode_int";





    /**

     * Indicates whether RTT is supported while roaming.

     */

    public static final String KEY_RTT_SUPPORTED_WHILE_ROAMING_BOOL =

            "rtt_supported_while_roaming";



    /**

    /**

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

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

     * Reference: GSMA RCC.14

     * Reference: GSMA RCC.14
@@ -4479,6 +4485,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_RTT_SUPPORTED_BOOL, false);

        sDefaults.putBoolean(KEY_RTT_SUPPORTED_BOOL, false);

        sDefaults.putBoolean(KEY_TTY_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_TTY_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_HIDE_TTY_HCO_VCO_WITH_RTT_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_TTY_HCO_VCO_WITH_RTT_BOOL, false);

        sDefaults.putBoolean(KEY_RTT_SUPPORTED_WHILE_ROAMING_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_CHARGE_INDICATION_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_NO_REPLY_TIMER_FOR_CFNRY_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_NO_REPLY_TIMER_FOR_CFNRY_BOOL, true);

        sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_FEATURE_ACCESS_CODES_STRING_ARRAY, null);