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

Commit 90e45bd6 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Simplified the initial attach APN logic" into sc-dev am: 3bdcaf83 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic543806ed5530448fd91d00594cdede5ffee76cc
parents a4d9d777 3bdcaf83

telephony/java/android/telephony/CarrierConfigManager.java

+13 −1
Original line number Diff line number Diff line
@@ -4772,6 +4772,16 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_HIDE_ENABLE_2G = "hide_enable_2g_bool";



    /**

     * Indicates the allowed APN types that can be used for LTE initial attach. The order of APN

     * types in the configuration is the order of APN types that will be used for initial attach.

     * Empty list indicates that no APN types are allowed for initial attach.

     *

     * @hide

     */

    public static final String KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY =

            "allowed_initial_attach_apn_types_string_array";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -5330,6 +5340,8 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0);

        sDefaults.putBoolean(KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true);

        sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false);

        sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,

                new String[]{"ia", "default", "ims", "mms", "dun", "emergency"});

    }



    /**