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

Commit b0977f52 authored by Joe LaPenna's avatar Joe LaPenna Committed by android-build-merger
Browse files

Merge "Add simplified_network_settings_bool to CarrierConfigManager." am: 9b430e03 am: 2bc66bf6 

am: b52989c7

Change-Id: I06dcc86f7e11e0db205f712b41dd3e7d0194bb36
parents 251e4283 b52989c7

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -153,6 +153,14 @@ public class CarrierConfigManager { 
    public static final String

            KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";



    /**

     * Control whether users receive a simplified network settings UI and improved network

     * selection.

     * @hide

     */

    public static final String

            KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_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";
@@ -1121,6 +1129,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_SIMPLIFIED_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_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);