summaryrefslogtreecommitdiffstats
path: root/assets
diff options
context:
space:
mode:
authorAndy Chou <andychou@google.com>2018-11-26 02:21:25 -0800
committerandroid-build-merger <android-build-merger@google.com>2018-11-26 02:21:25 -0800
commitc41d9b2a6cc517e88511e52fa8eca976476592cf (patch)
tree540cd605628e01963235251eaa60d24ebe7d0869 /assets
parent6c5c3c95a98f22174f052be7b4f198ee871ae435 (diff)
parent274ac2b7f64c21bd0f28a88c3eced4587299d09a (diff)
downloadandroid_packages_apps_CarrierConfig-c41d9b2a6cc517e88511e52fa8eca976476592cf.tar.gz
android_packages_apps_CarrierConfig-c41d9b2a6cc517e88511e52fa8eca976476592cf.tar.bz2
android_packages_apps_CarrierConfig-c41d9b2a6cc517e88511e52fa8eca976476592cf.zip
Merge "Update CarrierConfig about USCC ERI file" am: 047bb81b57 am: d7192fb7b0
am: 274ac2b7f6 Change-Id: Id2ab7191db3e99b1e5a38b32c4fd1dc50dc2366f
Diffstat (limited to 'assets')
-rw-r--r--assets/carrier_config_311220.xml1
-rw-r--r--assets/carrier_config_311580.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/assets/carrier_config_311220.xml b/assets/carrier_config_311220.xml
index 77a7762..88ba99e 100644
--- a/assets/carrier_config_311220.xml
+++ b/assets/carrier_config_311220.xml
@@ -19,5 +19,6 @@
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="false" />
<boolean name="show_apn_setting_cdma_bool" value="true" />
+ <string name="carrier_eri_file_name_string">eri_311220.xml</string>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311580.xml b/assets/carrier_config_311580.xml
index 9ecbcbb..dd83825 100644
--- a/assets/carrier_config_311580.xml
+++ b/assets/carrier_config_311580.xml
@@ -19,6 +19,7 @@
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="false" />
<boolean name="show_apn_setting_cdma_bool" value="true" />
+ <string name="carrier_eri_file_name_string">eri_311220.xml</string>
<boolean name="support_swap_after_merge_bool" value="false" />
</carrier_config>
<carrier_config imsi="^3115801.*">