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

Commit 30830e36 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Supported the legacy allowed initial attach APN types config" am: fcda785d 

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

Change-Id: I4796ac2d1e1600903e621cfd00c9059f7f2de0dd
parents 5cc5036f fcda785d

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -6469,7 +6469,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true);

        sDefaults.putBoolean(KEY_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true);

        sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false);

        sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false);

        sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,

        sDefaults.putStringArray(KEY_ALLOWED_INITIAL_ATTACH_APN_TYPES_STRING_ARRAY,

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

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

        sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);

        sDefaults.putBoolean(KEY_USE_IP_FOR_CALLING_INDICATOR_BOOL, false);

        sDefaults.putBoolean(KEY_USE_IP_FOR_CALLING_INDICATOR_BOOL, false);

        sDefaults.putBoolean(KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL, true);

        sDefaults.putBoolean(KEY_DISPLAY_CALL_STRENGTH_INDICATOR_BOOL, true);