summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin F. Haggerty <haggertk@lineageos.org>2019-05-07 01:04:29 (GMT)
committerKevin F. Haggerty <haggertk@lineageos.org>2019-05-07 01:04:29 (GMT)
commit2659c3b6f1d73e49ae3e9bdece14f05a15e0b1bf (patch)
tree3eaa9507462098dcc5d2be08bce8bce3901ffb90
parentd41f4d00a588773108e173c1087d53f40e6801e4 (diff)
parentfb861f45b48b80a222f2a2186cd56858b1ac1ab1 (diff)
downloadandroid_packages_apps_CarrierConfig-2659c3b6f1d73e49ae3e9bdece14f05a15e0b1bf.zip
android_packages_apps_CarrierConfig-2659c3b6f1d73e49ae3e9bdece14f05a15e0b1bf.tar.gz
android_packages_apps_CarrierConfig-2659c3b6f1d73e49ae3e9bdece14f05a15e0b1bf.tar.bz2
Merge tag 'android-9.0.0_r37' into staging/lineage-16.0_merge-android-9.0.0_r37
Android 9.0.0 Release 37 (PQ3A.190505.002) * tag 'android-9.0.0_r37': Remap ImsReasonInfo code 332 (403 sip forbidden) to 510 Update CarrierConfig about USCC ERI file Change-Id: Ide41061b3f9bc0a8d52fc149cb632263418cd085
-rw-r--r--assets/carrier_config_311220.xml1
-rw-r--r--assets/carrier_config_311580.xml1
-rw-r--r--assets/carrier_config_44010.xml3
3 files changed, 5 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 7a972ce..272eda1 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" />
<string name="carrier_eri_file_name_string">eri_311580.xml</string>
</carrier_config>
diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml
index 73b212e..8df2892 100644
--- a/assets/carrier_config_44010.xml
+++ b/assets/carrier_config_44010.xml
@@ -10,5 +10,8 @@
<long name="message_expiration_time_long" value="3600000" />
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+<string-array name="ims_reasoninfo_mapping_string_array" num="1">
+ <item value="332||510" />
+</string-array>
</carrier_config>
</carrier_config_list>