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

Commit e7e0dcda authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Add CarrierConfig to hide Preset APN setting details" 

am: 4d73d87d

Change-Id: I2b6e50a87c85c4e5132be1f35e4b4a29227cff66
parents 576351db 4d73d87d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42109,6 +42109,7 @@ package android.telephony { 
    field public static final java.lang.String KEY_HIDE_ENHANCED_4G_LTE_BOOL = "hide_enhanced_4g_lte_bool";

    field public static final java.lang.String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool";

    field public static final java.lang.String KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL = "hide_preferred_network_type_bool";

    field public static final java.lang.String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool";

    field public static final java.lang.String KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";

    field public static final java.lang.String KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL = "ignore_sim_network_locked_events_bool";

    field public static final java.lang.String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int";

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -1837,6 +1837,13 @@ public class CarrierConfigManager { 
    public static final String KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL =

            "notify_international_call_on_wfc_bool";



    /**

     * Flag to hide Preset APN details. If true, user cannot enter ApnEditor view of Preset APN,

     * and cannot view details of the APN. If false, user can enter ApnEditor view of Preset APN.

     * Default value is false.

     */

    public static final String KEY_HIDE_PRESET_APN_DETAILS_BOOL = "hide_preset_apn_details_bool";



    /**

     * Flag specifying whether to show an alert dialog for video call charges.

     * By default this value is {@code false}.
@@ -2605,6 +2612,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_DISPLAY_VOICEMAIL_NUMBER_AS_DEFAULT_CALL_FORWARDING_NUMBER_BOOL,

                false);

        sDefaults.putBoolean(KEY_NOTIFY_INTERNATIONAL_CALL_ON_WFC_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_PRESET_APN_DETAILS_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_VIDEO_CALL_CHARGES_ALERT_DIALOG_BOOL, false);

        sDefaults.putStringArray(KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY,

                null);