From f9a969624229177efe5ae55912cfb64e69f6375e Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Mon, 17 May 2021 18:42:33 +0000 Subject: Should not try IMS or EMERGENCY APN for initial-attach. This helps to avoid the problem where the auto-generated IMS or EMERGENCY APN being used for initial-attach due to racing conditions. Some carriers may require IMS APN for initial-attach. That case, the IA type should have been added to the APN explicitly to prevent the DEFAULT APN from being used. Bug: 186120396 Test: manual Change-Id: Ic5e449e514a996f90b815e56fe136ac1f453496e Merged-In: Ic5e449e514a996f90b815e56fe136ac1f453496e --- telephony/java/android/telephony/CarrierConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index f6ba7becc922..4be629dc6c3e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -4960,7 +4960,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, false); sDefaults.putInt(KEY_DEFAULT_RTT_MODE_INT, 0); 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_STORE_SIM_PIN_FOR_UNATTENDED_REBOOT_BOOL, true); sDefaults.putBoolean(KEY_HIDE_ENABLE_2G, false); sDefaults.putBoolean(KEY_DISPLAY_NO_DATA_NOTIFICATION_ON_PERMANENT_FAILURE_BOOL, false); -- cgit v1.2.3-59-g8ed1b