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

Commit 1b5b2516 authored by Yomna Nasser's avatar Yomna Nasser Committed by Automerger Merge Worker
Browse files

Merge "Change default value of KEY_PREFER_2G_BOOL." into tm-dev am: 0e3f74db 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17144543

Change-Id: Idbdbf205b26cfc5d896f978fd4797445c3220ccf
parents 96826a16 0e3f74db

telephony/java/android/telephony/CarrierConfigManager.java

+7 −2
Original line number Diff line number Diff line
@@ -504,7 +504,12 @@ public class CarrierConfigManager { 
    /** Control whether users can choose a network operator. */

    public static final String KEY_OPERATOR_SELECTION_EXPAND_BOOL = "operator_selection_expand_bool";



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

    /**

     * Used in the Preferred Network Types menu to determine if the 2G option is displayed.

     * Value defaults to false as of Android T to discourage the use of insecure 2G protocols.

     *

     * @see #KEY_HIDE_ENABLE_2G

     */

    public static final String KEY_PREFER_2G_BOOL = "prefer_2g_bool";



    /**
@@ -8594,7 +8599,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_IGNORE_SIM_NETWORK_LOCKED_EVENTS_BOOL, false);

        sDefaults.putBoolean(KEY_MDN_IS_ADDITIONAL_VOICEMAIL_NUMBER_BOOL, false);

        sDefaults.putBoolean(KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);

        sDefaults.putBoolean(KEY_PREFER_2G_BOOL, true);

        sDefaults.putBoolean(KEY_PREFER_2G_BOOL, false);

        sDefaults.putBoolean(KEY_4G_ONLY_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_APN_SETTING_CDMA_BOOL, false);

        sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);