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

Commit 283098bc authored by Gary Jian's avatar Gary Jian Committed by Automerger Merge Worker
Browse files

Merge "Expose VoNR keys as public API to let carrier service able to config"... 

Merge "Expose VoNR keys as public API to let carrier service able to config" am: ce1c0862 am: c633bfc9 am: 25312669

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



Change-Id: Ia247cadd73a97ed4f60a02d659682e83e8893ffc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5244f76b 25312669

core/api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -41793,6 +41793,8 @@ package android.telephony { 
    field public static final String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final String KEY_VOICEMAIL_NOTIFICATION_PERSISTENT_BOOL = "voicemail_notification_persistent_bool";

    field public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final String KEY_VOICE_PRIVACY_DISABLE_UI_BOOL = "voice_privacy_disable_ui_bool";

    field public static final String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final String KEY_VOLTE_REPLACEMENT_RAT_INT = "volte_replacement_rat_int";

    field public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";

    field public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool";

    field public static final String KEY_VT_UPGRADE_SUPPORTED_FOR_DOWNGRADED_RTT_CALL_BOOL = "vt_upgrade_supported_for_downgraded_rtt_call";

    field public static final String KEY_VT_UPGRADE_SUPPORTED_FOR_DOWNGRADED_RTT_CALL_BOOL = "vt_upgrade_supported_for_downgraded_rtt_call";

    field public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool";

    field public static final String KEY_VVM_CELLULAR_DATA_REQUIRED_BOOL = "vvm_cellular_data_required_bool";

    field public static final String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";

    field public static final String KEY_VVM_CLIENT_PREFIX_STRING = "vvm_client_prefix_string";

telephony/java/android/telephony/CarrierConfigManager.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -8658,11 +8658,12 @@ public class CarrierConfigManager { 




    /**

    /**

     * Boolean indicating if the VoNR setting is visible in the Call Settings menu.

     * Boolean indicating if the VoNR setting is visible in the Call Settings menu.

     * If true, the VoNR setting menu will be visible. If false, the menu will be gone.

     * If this flag is set and VoNR is enabled for this carrier (see {@link #KEY_VONR_ENABLED_BOOL})

     * the VoNR setting menu will be visible. If {@link #KEY_VONR_ENABLED_BOOL} or

     * this setting is false, the menu will be gone.

     *

     *

     * Disabled by default.

     * Enabled by default.

     *

     *

     * @hide

     */

     */

    public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool";

    public static final String KEY_VONR_SETTING_VISIBILITY_BOOL = "vonr_setting_visibility_bool";
@@ -8672,7 +8673,6 @@ public class CarrierConfigManager { 
     *

     *

     * Disabled by default.

     * Disabled by default.

     *

     *

     * @hide

     */

     */

    public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";

    public static final String KEY_VONR_ENABLED_BOOL = "vonr_enabled_bool";