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

Commit 07e02b6d authored by Junda Liu's avatar Junda Liu Committed by Android (Google) Code Review
Browse files

Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev

parents 7b1b3613 cd115b73

telephony/java/android/telephony/CarrierConfigManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -133,8 +133,8 @@ public class CarrierConfigManager { 
    /** Used in Cellular Network Settings for preferred network type. */

    /** Used in Cellular Network Settings for preferred network type. */

    public static final String BOOL_PREFER_2G = "bool_prefer_2g";

    public static final String BOOL_PREFER_2G = "bool_prefer_2g";





    /** Show cdma auto network mode in (glabal) roaming */

    /** Show cdma network mode choices 1x, 3G, global etc. */

    public static final String BOOL_SHOW_CDMA = "bool_show_cdma";

    public static final String BOOL_SHOW_CDMA_CHOICES = "bool_show_cdma_choices";





    /** CDMA activation goes through HFA */

    /** CDMA activation goes through HFA */

    public static final String BOOL_USE_HFA_FOR_PROVISIONING = "bool_use_hfa_for_provisioning";

    public static final String BOOL_USE_HFA_FOR_PROVISIONING = "bool_use_hfa_for_provisioning";
@@ -256,7 +256,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(BOOL_OPERATOR_SELECTION_EXPAND, true);

        sDefaults.putBoolean(BOOL_OPERATOR_SELECTION_EXPAND, true);

        sDefaults.putBoolean(BOOL_PREFER_2G, true);

        sDefaults.putBoolean(BOOL_PREFER_2G, true);

        sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);

        sDefaults.putBoolean(BOOL_SHOW_APN_SETTING_CDMA, false);

        sDefaults.putBoolean(BOOL_SHOW_CDMA, false);

        sDefaults.putBoolean(BOOL_SHOW_CDMA_CHOICES, false);

        sDefaults.putBoolean(BOOL_SHOW_ONSCREEN_DIAL_BUTTON, true);

        sDefaults.putBoolean(BOOL_SHOW_ONSCREEN_DIAL_BUTTON, true);

        sDefaults.putBoolean(BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS, true);

        sDefaults.putBoolean(BOOL_SIM_NETWORK_UNLOCK_ALLOW_DISMISS, true);

        sDefaults.putBoolean(BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS, true);

        sDefaults.putBoolean(BOOL_SUPPORT_PAUSE_IMS_VIDEO_CALLS, true);