From 0c1c51f697361fd98d54a0df1423f19f2180630e Mon Sep 17 00:00:00 2001
From: Andy Chou <andychou@google.com>
Date: Mon, 26 Nov 2018 02:21:25 -0800
Subject: Update CarrierConfig about USCC ERI file

Bug: 110808862
Test: Build pass

Change-Id: Id2ab7191db3e99b1e5a38b32c4fd1dc50dc2366f
Merged-In: Id2ab7191db3e99b1e5a38b32c4fd1dc50dc2366f
(cherry picked from commit c41d9b2a6cc517e88511e52fa8eca976476592cf)
---
 assets/carrier_config_311220.xml | 1 +
 assets/carrier_config_311580.xml | 1 +
 2 files changed, 2 insertions(+)

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.*">
-- 
cgit v1.2.3


From 041eb4eb32aeec86ba7da581f3c7b944bfcdd82a Mon Sep 17 00:00:00 2001
From: andychou <andychou@google.com>
Date: Thu, 29 Nov 2018 17:32:51 +0800
Subject: Remap ImsReasonInfo code 332 (403 sip forbidden) to 510

Remap ims reason code 332 (403 sip forbidden) to code 510
CODE_USER_TERMINATED_BY_REMOTE.
This carrier reports sip 403 when a remote party rejects a call.

Bug: 119804849
Test: Field Testing Pass

Change-Id: I22a6b6aba98978953efe974d8fc034467f0a6db1
Merged-In: I4af71ca3f7e405e358ec298824d70bc97c316cb0
---
 assets/carrier_config_44010.xml | 3 +++
 1 file changed, 3 insertions(+)

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>
-- 
cgit v1.2.3