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

Commit 6d33045d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Should not try IMS or EMERGENCY APN for initial-attach." into sc-dev am: 557e16ba 

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

Change-Id: I2ac12389dd9c3ea0a4c1bc52533bb391897fda76
parents 6f8abf7e 557e16ba

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -5549,7 +5549,7 @@ public class CarrierConfigManager { 
        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"});

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

        sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);

        sDefaults.putBoolean(KEY_USE_IP_FOR_CALLING_INDICATOR_BOOL, false);

        sDefaults.putBoolean(KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL, true);