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

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

Merge "Correct name of roaming RTT config" am: b6622aee am: a083efc1 am:... 

Merge "Correct name of roaming RTT config" am: b6622aee am: a083efc1 am: bd4e78b0 am: eeb227a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e780c3dae22cf61accca6e0a5a5131696858a32
parents b0f238fe eeb227a6

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -40223,7 +40223,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_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_WHILE_ROAMING_BOOL = "rtt_supported_while_roaming";

    field public static final String KEY_RTT_SUPPORTED_WHILE_ROAMING_BOOL = "rtt_supported_while_roaming_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_LTE_DATA_ICON_BOOL = "show_4g_for_lte_data_icon_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -4718,7 +4718,7 @@ public class CarrierConfigManager { 
     * Indicates whether RTT is supported while roaming.

     */

    public static final String KEY_RTT_SUPPORTED_WHILE_ROAMING_BOOL =

            "rtt_supported_while_roaming";

            "rtt_supported_while_roaming_bool";



    /**

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