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
Change-Id: Ic5e449e514a996f90b815e56fe136ac1f453496e
Test: manual
This commit is contained in:
Meng Wang
2021-05-17 18:42:33 +00:00
parent 3ec445926b
commit 77f9e2adfc

View File

@@ -5511,7 +5511,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);