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

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

Merge "Add simplified_network_settings_bool to CarrierConfigManager." am:... 

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

Change-Id: I3c1db8b94e35bc4bb3df17fa2e6e1a3af6683e4a
parents cf4d2ce3 b0977f52

telephony/java/android/telephony/CarrierConfigManager.java

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

    public static final String

            KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";

            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. */

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

    public static final String

    public static final String

            KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";

            KEY_HIDE_SIM_LOCK_SETTINGS_BOOL = "hide_sim_lock_settings_bool";
@@ -1179,6 +1187,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);

        sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);

        sDefaults.putBoolean(KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL, false);

        sDefaults.putBoolean(KEY_HAS_IN_CALL_NOISE_SUPPRESSION_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_CARRIER_NETWORK_SETTINGS_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_HIDE_SIM_LOCK_SETTINGS_BOOL, false);





        sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONED_BOOL, false);