Merge N-MR1 to remote branch.

Change-Id: I2b7a15c73e37e846790efaca39e7989011334676

53 files changed, 385 insertions, 91 deletions

diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index d993eb0..b67d4a0 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -9,5 +9,27 @@
         <boolean name="allow_adding_apns_bool" value="false" />
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
+        <int name="carrier_default_wfc_ims_mode_int" value="1"/>
+        <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string-array name="read_only_apn_fields_string_array" num="6">
+            <item value="type" />
+            <item value="protocol" />
+            <item value="roaming_protocol" />
+            <item value="bearer" />
+            <item value="bearer_bitmask" />
+            <item value="carrier_enabled" />
+        </string-array>
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_23415.xml b/assets/carrier_config_23415.xml
index 07fc848..ebeb778 100644
--- a/assets/carrier_config_23415.xml
+++ b/assets/carrier_config_23415.xml
@@ -2,5 +2,8 @@
 <carrier_config_list>
 <carrier_config>
 <int name="smsToMmsTextThreshold" value="10" />
+<string-array name="read_only_apn_types_string_array" num="1">
+    <item value="*" />
+</string-array>
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_23427.xml b/assets/carrier_config_23427.xml
new file mode 100644
index 0000000..c3dc5d5
--- /dev/null
+++ b/assets/carrier_config_23427.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string-array name="read_only_apn_types_string_array" num="1">
+            <item value="*" />
+        </string-array>
+    </carrier_config>
+</carrier_config_list>
\ No newline at end of file
diff --git a/assets/carrier_config_23430.xml b/assets/carrier_config_23430.xml
index 540f250..910b247 100644
--- a/assets/carrier_config_23430.xml
+++ b/assets/carrier_config_23430.xml
@@ -5,4 +5,8 @@
         <int name="wfc_spn_format_idx_int" value="1" />
         <string-array name="wfc_operator_error_codes_string_array" num="1"><item value="REG09|0" /></string-array>
     </carrier_config>
+    <carrier_config gid1="28000000">
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">Virgin</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_23433.xml b/assets/carrier_config_23433.xml
index 05cbf7c..910b247 100644
--- a/assets/carrier_config_23433.xml
+++ b/assets/carrier_config_23433.xml
@@ -1,11 +1,12 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
     <carrier_config>
-        <int name="vvm_port_number_int" value="20481" />
-        <string name="vvm_destination_number_string">887</string>
-        <string name="vvm_type_string">vvm_type_omtp</string>
         <boolean name="prefer_2g_bool" value="false" />
         <int name="wfc_spn_format_idx_int" value="1" />
         <string-array name="wfc_operator_error_codes_string_array" num="1"><item value="REG09|0" /></string-array>
     </carrier_config>
+    <carrier_config gid1="28000000">
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">Virgin</string>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_23438.xml b/assets/carrier_config_23438.xml
new file mode 100644
index 0000000..47fd139
--- /dev/null
+++ b/assets/carrier_config_23438.xml
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config gid1="28000000">
+        <boolean name="carrier_name_override_bool" value="true" />
+        <string name="carrier_name_string">Virgin</string>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_23491.xml b/assets/carrier_config_23491.xml
new file mode 100644
index 0000000..c3dc5d5
--- /dev/null
+++ b/assets/carrier_config_23491.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <string-array name="read_only_apn_types_string_array" num="1">
+            <item value="*" />
+        </string-array>
+    </carrier_config>
+</carrier_config_list>
\ No newline at end of file
diff --git a/assets/carrier_config_302220.xml b/assets/carrier_config_302220.xml
index d247feb..13473c1 100644
--- a/assets/carrier_config_302220.xml
+++ b/assets/carrier_config_302220.xml
@@ -8,5 +8,8 @@
         <int name="maxMessageSize" value="1048576" />
         <int name="maxImageWidth" value="2592" />
         <boolean name="voicemail_notification_persistent_bool" value="true" />
+        <string-array name="read_only_apn_types_string_array" num="1">
+            <item value="*" />
+        </string-array>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_302370.xml b/assets/carrier_config_302370.xml
index 714e34c..c283543 100644
--- a/assets/carrier_config_302370.xml
+++ b/assets/carrier_config_302370.xml
@@ -7,5 +7,8 @@
 <int name="maxSubjectLength" value="80" />
 <int name="maxMessageSize" value="1048576" />
 <int name="maxImageWidth" value="2592" />
+<string-array name="read_only_apn_types_string_array" num="1">
+    <item value="*" />
+</string-array>
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_302610.xml b/assets/carrier_config_302610.xml
index c597ac7..14f02e0 100644
--- a/assets/carrier_config_302610.xml
+++ b/assets/carrier_config_302610.xml
@@ -4,12 +4,14 @@
         <int name="smsToMmsTextThreshold" value="8" />
         <int name="recipientLimit" value="20" />
         <int name="maxImageHeight" value="1944" />
-        <boolean name="config_cellBroadcastAppLinks" value="false" />
         <int name="maxSubjectLength" value="80" />
         <boolean name="enableGroupMms" value="false" />
         <string name="emailGatewayNumber">6245</string>
         <int name="maxMessageSize" value="614400" />
         <int name="maxImageWidth" value="2592" />
         <boolean name="voicemail_notification_persistent_bool" value="true" />
+        <string-array name="read_only_apn_types_string_array" num="1">
+            <item value="*" />
+        </string-array>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_302720.xml b/assets/carrier_config_302720.xml
index fd8e203..0f16772 100644
--- a/assets/carrier_config_302720.xml
+++ b/assets/carrier_config_302720.xml
@@ -8,5 +8,8 @@
         <int name="maxMessageSize" value="1048576" />
         <int name="maxImageWidth" value="2592" />
         <boolean name="voicemail_notification_persistent_bool" value="true" />
+        <string-array name="read_only_apn_types_string_array" num="1">
+            <item value="*" />
+        </string-array>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index fd79ce5..844ec2f 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -27,7 +27,28 @@
         <boolean name="allow_adding_apns_bool" value="false" />
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
-        <boolean name="reject_ggsn_perm_failure" value="false" />
-        <boolean name="protocol_errors_perm_failure" value="false" />
+        <int name="carrier_default_wfc_ims_mode_int" value="1"/>
+        <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
+        <boolean name="mmsCloseConnection" value="true"/>
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string-array name="read_only_apn_fields_string_array" num="6">
+            <item value="type" />
+            <item value="protocol" />
+            <item value="roaming_protocol" />
+            <item value="bearer" />
+            <item value="bearer_bitmask" />
+            <item value="carrier_enabled" />
+        </string-array>
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310010.xml b/assets/carrier_config_310010.xml
index d654631..dab5e81 100644
--- a/assets/carrier_config_310010.xml
+++ b/assets/carrier_config_310010.xml
@@ -1,15 +1,16 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="enableSMSDeliveryReports" value="false" />
-<int name="maxMessageTextSize" value="-1" />
-<boolean name="supportMmsContentDisposition" value="false" />
-<int name="maxImageHeight" value="1944" />
-<boolean name="enableMMSDeliveryReports" value="false" />
-<int name="maxMessageSize" value="1048576" />
-<boolean name="enableMMSReadReports" value="false" />
-<int name="maxImageWidth" value="2592" />
-<boolean name="sendMultipartSmsAsSeparateMessages" value="true" />
-<boolean name="enableMultipartSMS" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="enableSMSDeliveryReports" value="false"/>
+        <int name="maxMessageTextSize" value="-1"/>
+        <boolean name="supportMmsContentDisposition" value="false"/>
+        <int name="maxImageHeight" value="1944"/>
+        <boolean name="enableMMSDeliveryReports" value="false"/>
+        <int name="maxMessageSize" value="1048576"/>
+        <boolean name="enableMMSReadReports" value="false"/>
+        <int name="maxImageWidth" value="2592"/>
+        <boolean name="sendMultipartSmsAsSeparateMessages" value="true"/>
+        <boolean name="enableMultipartSMS" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310012.xml b/assets/carrier_config_310012.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_310012.xml
+++ b/assets/carrier_config_310012.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310013.xml b/assets/carrier_config_310013.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_310013.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_310120.xml b/assets/carrier_config_310120.xml
index 433e052..941ff6d 100644
--- a/assets/carrier_config_310120.xml
+++ b/assets/carrier_config_310120.xml
@@ -27,5 +27,6 @@
 <boolean name="enableMultipartSMS" value="true" />
 <boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" />
 <string name="carrier_eri_file_name_string">eri_310120.xml</string>
+<boolean name="stk_disable_launch_browser_bool" value="true" />
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310590.xml b/assets/carrier_config_310590.xml
index d91c197..f5142a4 100644
--- a/assets/carrier_config_310590.xml
+++ b/assets/carrier_config_310590.xml
@@ -1,17 +1,18 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="carrier_volte_available_bool" value="true" />
-<boolean name="carrier_volte_tty_supported_bool" value="false" />
-<boolean name="carrier_wfc_ims_available_bool" value="true" />
-<boolean name="carrier_ims_gba_required_bool" value="true" />
-<int name="vvm_port_number_int" value="1808" />
-<string name="vvm_destination_number_string">122</string>
-<string name="carrier_vvm_package_name_string">com.tmobile.vvm.application</string>
-<string name="vvm_type_string">vvm_type_cvvm</string>
-<int name="volte_replacement_rat_int" value="3" />
-<int name="maxMessageSize" value="1048576" />
-<int name="maxImageWidth" value="2592" />
-<int name="maxImageHeight" value="1944" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="carrier_volte_available_bool" value="true"/>
+        <boolean name="carrier_volte_tty_supported_bool" value="false"/>
+        <boolean name="carrier_wfc_ims_available_bool" value="true"/>
+        <boolean name="carrier_ims_gba_required_bool" value="true"/>
+        <int name="vvm_port_number_int" value="1808"/>
+        <string name="vvm_destination_number_string">122</string>
+        <string name="carrier_vvm_package_name_string">com.tmobile.vvm.application</string>
+        <string name="vvm_type_string">vvm_type_cvvm</string>
+        <int name="volte_replacement_rat_int" value="3"/>
+        <int name="maxMessageSize" value="1048576"/>
+        <int name="maxImageWidth" value="2592"/>
+        <int name="maxImageHeight" value="1944"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310890.xml b/assets/carrier_config_310890.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_310890.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_310910.xml b/assets/carrier_config_310910.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_310910.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311110.xml b/assets/carrier_config_311110.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311110.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311270.xml b/assets/carrier_config_311270.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311270.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311271.xml b/assets/carrier_config_311271.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311271.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311272.xml b/assets/carrier_config_311272.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311272.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311273.xml b/assets/carrier_config_311273.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311273.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311274.xml b/assets/carrier_config_311274.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311274.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311275.xml b/assets/carrier_config_311275.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311275.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311276.xml b/assets/carrier_config_311276.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311276.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311277.xml b/assets/carrier_config_311277.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311277.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311278.xml b/assets/carrier_config_311278.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311278.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311279.xml b/assets/carrier_config_311279.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311279.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311280.xml b/assets/carrier_config_311280.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311280.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311281.xml b/assets/carrier_config_311281.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311281.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311282.xml b/assets/carrier_config_311282.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311282.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311283.xml b/assets/carrier_config_311283.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311283.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311284.xml b/assets/carrier_config_311284.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311284.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311285.xml b/assets/carrier_config_311285.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311285.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311286.xml b/assets/carrier_config_311286.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311286.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311287.xml b/assets/carrier_config_311287.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311287.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311288.xml b/assets/carrier_config_311288.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311288.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311289.xml b/assets/carrier_config_311289.xml
new file mode 100644
index 0000000..3fdcc52
--- /dev/null
+++ b/assets/carrier_config_311289.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
+<carrier_config_list>
+    <carrier_config>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
+</carrier_config_list>
diff --git a/assets/carrier_config_311390.xml b/assets/carrier_config_311390.xml
index bc0a573..4f6352d 100644
--- a/assets/carrier_config_311390.xml
+++ b/assets/carrier_config_311390.xml
@@ -1,9 +1,10 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="dtmf_type_enabled_bool" value="true" />
-<boolean name="show_apn_setting_cdma_bool" value="true" />
-<boolean name="carrier_volte_available_bool" value="true" />
-<int name="volte_replacement_rat_int" value="6" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="dtmf_type_enabled_bool" value="true"/>
+        <boolean name="show_apn_setting_cdma_bool" value="true"/>
+        <boolean name="carrier_volte_available_bool" value="true"/>
+        <int name="volte_replacement_rat_int" value="6"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 4b7295d..2580fb9 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
     <carrier_config>
+        <boolean name="allow_hold_in_ims_call" value="false" />
         <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="support_downgrade_vt_to_audio_bool" value="false" />
+        <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
         <boolean name="carrier_volte_provisioning_required_bool" value="true" />
         <boolean name="operator_selection_expand_bool" value="true" />
@@ -32,8 +35,50 @@
         <boolean name="allow_adding_apns_bool" value="false" />
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
-        <boolean name="reject_ggsn_perm_failure" value="false" />
-        <boolean name="protocol_errors_perm_failure" value="false" />
-        <boolean name="carrier_map_anonymous_to_restricted" value="false" />
+        <int name="carrier_default_wfc_ims_mode_int" value="1"/>
+        <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
+        <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
+        <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false" />
+        <boolean name="wifi_calls_can_be_hd_audio" value="false" />
+        <boolean name="video_calls_can_be_hd_audio" value="false" />
+        <boolean name="allow_add_call_during_video_call" value="false" />
+        <boolean name="carrier_promote_wfc_on_call_fail_bool" value="true" />
+        <string-array name="ims_reasoninfo_mapping_string_array" num="8">
+            <item value="332|simultaneous call limit has already been reached|1403" />
+            <item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403" />
+            <item value="338|another device sent all devices busy response|1404" />
+            <item value="501|call completion elsewhere|1014" />
+            <item value="501|call has been pulled by another device|1016" />
+            <item value="501|another device sent all devices busy response|1404" />
+            <item value="510|another device sent all devices busy response|1404" />
+            <item value="1014|call has been pulled by another device|1016" />
+        </string-array>
+        <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
+        <boolean name="mmsCloseConnection" value="true"/>
+        <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true" />
+        <int name="wfc_spn_format_idx_int" value="1" />
+        <string-array name="filtered_cnap_names_string_array" num="2">
+            <item value="WIRELESS CALLER" />
+            <item value="UNKNOWN NAME" />
+        </string-array>
+        <string-array name="read_only_apn_fields_string_array" num="6">
+            <item value="type" />
+            <item value="protocol" />
+            <item value="roaming_protocol" />
+            <item value="bearer" />
+            <item value="bearer_bitmask" />
+            <item value="carrier_enabled" />
+        </string-array>
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311481.xml b/assets/carrier_config_311481.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311481.xml
+++ b/assets/carrier_config_311481.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311482.xml b/assets/carrier_config_311482.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311482.xml
+++ b/assets/carrier_config_311482.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311483.xml b/assets/carrier_config_311483.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311483.xml
+++ b/assets/carrier_config_311483.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311484.xml b/assets/carrier_config_311484.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311484.xml
+++ b/assets/carrier_config_311484.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311485.xml b/assets/carrier_config_311485.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311485.xml
+++ b/assets/carrier_config_311485.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311486.xml b/assets/carrier_config_311486.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311486.xml
+++ b/assets/carrier_config_311486.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311487.xml b/assets/carrier_config_311487.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311487.xml
+++ b/assets/carrier_config_311487.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311488.xml b/assets/carrier_config_311488.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311488.xml
+++ b/assets/carrier_config_311488.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311489.xml b/assets/carrier_config_311489.xml
index bd50f43..a4ed51a 100644
--- a/assets/carrier_config_311489.xml
+++ b/assets/carrier_config_311489.xml
@@ -1,8 +1,9 @@
 <?xml version='1.0' encoding='utf-8' standalone='yes' ?>
 <carrier_config_list>
-<carrier_config>
-<boolean name="operator_selection_expand_bool" value="true" />
-<boolean name="apn_expand_bool" value="false" />
-<boolean name="prefer_2g_bool" value="false" />
-</carrier_config>
+    <carrier_config>
+        <boolean name="operator_selection_expand_bool" value="true"/>
+        <boolean name="apn_expand_bool" value="false"/>
+        <boolean name="prefer_2g_bool" value="false"/>
+        <boolean name="mmsCloseConnection" value="true"/>
+    </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311580.xml b/assets/carrier_config_311580.xml
index 611fbf2..0416ec7 100644
--- a/assets/carrier_config_311580.xml
+++ b/assets/carrier_config_311580.xml
@@ -18,5 +18,6 @@
 <boolean name="enabledNotifyWapMMSC" value="true" />
 <boolean name="enableMultipartSMS" value="false" />
 <boolean name="show_apn_setting_cdma_bool" value="true" />
+<boolean name="support_swap_after_merge_bool" value="false" />
 </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 4d787a6..7b128e3 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -12,5 +12,10 @@
 <int name="volte_replacement_rat_int" value="3" />
 <int name="ims_dtmf_tone_delay_int" value="215" />
 <boolean name="always_show_emergency_alert_onoff_bool" value="true" />
+<string-array name="carrier_additional_cbs_channels_strings" num="3">
+    <item value="0xA800:type=earthquake, emergency=true" />
+    <item value="0xAFEE:type=tsunami, emergency=true" />
+    <item value="0xAC00-0xAFED:type=other, emergency=true" />
+</string-array>
 </carrier_config>
 </carrier_config_list>