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

Commit d21677e7 authored by Junda Liu's avatar Junda Liu Committed by Android Git Automerger
Browse files

am 425ae5d0: am 0cae34a5: am a5aabfeb: Merge "Add carrier config variable to... 

am 425ae5d0: am 0cae34a5: am a5aabfeb: Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev

* commit '425ae5d0':
  Add carrier config variable to hide sim lock setting ui.
parents 37411e7d 425ae5d0

api/current.txt

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

    field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool";

    field public static final java.lang.String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_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_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";

    field public static final java.lang.String KEY_MMS_ALIAS_MAX_CHARS_INT = "aliasMaxChars";

api/system-current.txt

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

    field public static final java.lang.String KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL = "has_in_call_noise_suppression_bool";

    field public static final java.lang.String KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_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_MMS_ALIAS_ENABLED_BOOL = "aliasEnabled";

    field public static final java.lang.String KEY_MMS_ALIAS_MAX_CHARS_INT = "aliasMaxChars";

telephony/java/android/telephony/CarrierConfigManager.java

+5 −0
Original line number Diff line number Diff line
@@ -125,6 +125,10 @@ public class CarrierConfigManager { 
    public static final String

            KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";



    /** Control whether users can reach the SIM lock settings. */

    public static final String

            KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";



    /** Control whether users can edit APNs in Settings. */

    public static final String KEY_APN_EXPAND_BOOL = "apn_expand_bool";
@@ -328,6 +332,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);

        sDefaults.putBoolean(KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_SIM_LOCK_SETTINGS_BOOL, false);

        sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);

        sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);

        sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true);