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

Commit 98cca45e authored by Rambo Wang's avatar Rambo Wang Committed by Automerger Merge Worker
Browse files

Merge "Expose two carrier configs for additional call settings" into main am: 6ab922f1 

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



Change-Id: Ie91f3a928ca2788520d4b8862f1ff5d673df4165
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5893160b 6ab922f1

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -41314,6 +41314,8 @@ package android.telephony { 
    field public static final String KEY_5G_NR_SSRSRQ_THRESHOLDS_INT_ARRAY = "5g_nr_ssrsrq_thresholds_int_array";

    field public static final String KEY_5G_NR_SSSINR_THRESHOLDS_INT_ARRAY = "5g_nr_sssinr_thresholds_int_array";

    field public static final String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL = "additional_settings_caller_id_visibility_bool";

    field public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL = "additional_settings_call_waiting_visibility_bool";

    field public static final String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";

    field public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";

    field public static final String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+4 −2
Original line number Diff line number Diff line
@@ -244,7 +244,8 @@ public class CarrierConfigManager { 
    /**

     * Boolean indicating if the "Caller ID" item is visible in the Additional Settings menu.

     * true means visible. false means gone.

     * @hide

     *

     * The default value is true.

     */

    public static final String KEY_ADDITIONAL_SETTINGS_CALLER_ID_VISIBILITY_BOOL =

            "additional_settings_caller_id_visibility_bool";
@@ -252,7 +253,8 @@ public class CarrierConfigManager { 
    /**

     * Boolean indicating if the "Call Waiting" item is visible in the Additional Settings menu.

     * true means visible. false means gone.

     * @hide

     *

     * The default value is true.

     */

    public static final String KEY_ADDITIONAL_SETTINGS_CALL_WAITING_VISIBILITY_BOOL =

            "additional_settings_call_waiting_visibility_bool";