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

Commit 8d6bfa60 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add config to only allow auto select of networks" 

am: e6607763

Change-Id: Ibeb3c0d6f5fe54298a44a6a618e103aa710999d6
parents 66c63a4b e6607763

telephony/java/android/telephony/CarrierConfigManager.java

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

            KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL = "hide_carrier_network_settings_bool";



    /**

     * Do only allow auto selection in Advanced Network Settings when in home network.

     * Manual selection is allowed when in roaming network.

     * @hide

     */

    public static final String

            KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL = "only_auto_select_in_home_network";



    /**

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

     * selection.
@@ -2182,6 +2190,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_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL, false);

        sDefaults.putBoolean(KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_SIM_LOCK_SETTINGS_BOOL, false);