summaryrefslogtreecommitdiff
path: root/telephony/java
diff options
context:
space:
mode:
authorMeng Wang <mewan@google.com>2021-05-17 18:42:33 +0000
committerMeng Wang <mewan@google.com>2021-05-17 12:04:40 -0700
commit77f9e2adfc982ff5fc669441f465645b475d5c88 (patch)
treefcfef4a282b20e153c8b99c0b300dddf4680a534 /telephony/java
parent3ec445926ba8cb20295eb80e64939b017565ba51 (diff)
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
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 5716a1d79040..c2419c1d40ef 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -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);