diff --git a/overlay/CarrierConfigResCommon/res/xml/vendor.xml b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
index 83104df..7ff369b 100644
--- a/overlay/CarrierConfigResCommon/res/xml/vendor.xml
+++ b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
@@ -41,8 +41,6 @@
         <boolean name="carrier_allow_transfer_ims_call_bool" value="true" />
         <long name="carrier_data_call_apn_retry_after_disconnect_long" value="100" />
         <string name="gps.nfw_proxy_apps">com.example.android.locationattribution</string>
-        <boolean name="carrier_cross_sim_ims_available_bool" value="true" />
-        <boolean name="carrier_b2c_enriched_calling_supported_bool" value="false" />
         <boolean name="dtmf_type_enabled_bool" value="true" />
         <boolean name="csp_enabled_bool" value="true" />
     </carrier_config>
@@ -133,15 +131,9 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="208" mnc="02">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="208" mnc="08">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="208" mnc="08">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -174,7 +166,6 @@
     </carrier_config>
     <carrier_config mcc="208" mnc="91">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="214" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -235,12 +226,6 @@
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
         <boolean name="editable_wfc_roaming_mode_bool" value="false" />
     </carrier_config>
-    <carrier_config mcc="228" mnc="53">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="true" />
-        <int name="carrier_default_wfc_ims_mode_int" value="2" />
-    </carrier_config>
     <carrier_config mcc="230" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -486,7 +471,6 @@
     <carrier_config mcc="262" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="262" mnc="03">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -512,11 +496,6 @@
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="262" mnc="09">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
-    </carrier_config>
     <carrier_config mcc="262" mnc="11">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -1210,17 +1189,8 @@
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
     </carrier_config>
-    <carrier_config mcc="440" mnc="52">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
-    </carrier_config>
     <carrier_config mcc="440" mnc="53">
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
-    </carrier_config>
-    <carrier_config mcc="440" mnc="54">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_allow_deflect_ims_call_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="450" mnc="02">
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -1301,7 +1271,6 @@
             <item value="supl" />
         </string-array>
         <boolean name="config_update_service_status" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="455" mnc="07">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1322,7 +1291,6 @@
             <item value="supl" />
         </string-array>
         <boolean name="config_update_service_status" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="00">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1390,8 +1358,6 @@
             <item value="1" />
         </int-array>
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
-        <boolean name="carrier_data_channel_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="01">
         <boolean name="notify_video_call_failed" value="true" />
@@ -1429,7 +1395,6 @@
             <item value="1" />
         </int-array>
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="02">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1497,8 +1462,6 @@
             <item value="1" />
         </int-array>
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
-        <boolean name="carrier_data_channel_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="03">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1544,7 +1507,6 @@
         </int-array>
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="04">
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1609,7 +1571,6 @@
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="07">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1676,8 +1637,6 @@
             <item value="1" />
         </int-array>
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
-        <boolean name="carrier_data_channel_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="08">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1743,8 +1702,6 @@
             <item value="1" />
         </int-array>
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
-        <boolean name="carrier_data_channel_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="09">
         <boolean name="notify_video_call_failed" value="true" />
@@ -1777,7 +1734,6 @@
             <item value="1" />
         </int-array>
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="10">
         <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
@@ -1831,7 +1787,6 @@
         </int-array>
         <boolean name="carrier_video_crs_supported_bool" value="true" />
         <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="460" mnc="12">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -1870,65 +1825,7 @@
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
-        <boolean name="check_mobile_data_for_cf" value="true" />
-        <boolean name="config_disable_outgoing_callbarring_over_ims" value="true" />
-        <boolean name="config_disable_change_password_over_ims" value="true" />
-        <boolean name="config_spn_override_enabled" value="true" />
-        <boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
-        <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="show_video_quality_toast" value="false" />
-        <boolean name="show_call_session_event_toast" value="false" />
-        <boolean name="show_data_usage_toast" value="false" />
-        <string-array name="apn_hide_rule_strings_array" num="2">
-            <item value="type" />
-            <item value="fota,ims" />
-        </string-array>
-        <map name="apn_default_values_strings_array">
-            <string name="protocol">IPV4V6</string>
-            <string name="roaming_protocol">IPV4V6</string>
-        </map>
-        <string-array name="carrier_metered_apn_types_strings" num="4">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-            <item value="fota" />
-        </string-array>
-        <boolean name="config_show_srvcc_toast" value="true" />
-        <boolean name="ims_call_type_enabled" value="true" />
-        <boolean name="config_enable_conference_dialer" value="true" />
-        <boolean name="config_conference_call_show_participant_status" value="true" />
-        <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
-        <boolean name="add_multi_participants_enabled" value="true" />
-        <boolean name="add_participant_only_in_conference" value="true" />
-        <boolean name="config_enable_cfu_time" value="true" />
-        <boolean name="support_cancel_modify_call" value="true" />
-        <boolean name="config_enable_video_crbt" value="true" />
-        <boolean name="config_hide_vt_callforward_option" value="true" />
-        <boolean name="disable_filter_out_conference_host" value="true" />
-        <boolean name="identify_high_definition_calls_in_call_log_bool" value="true" />
-        <boolean name="ignore_reset_ut_capability_bool" value="true" />
-        <boolean name="carrier_parse_number_on_forward_call_bool" value="true" />
-        <string name="carrier_name_string">China Broadcasting</string>
-        <boolean name="config_update_service_status" value="false" />
-        <boolean name="support_video_conference_call_bool" value="false" />
-        <boolean name="allow_add_call_during_video_call" value="false" />
-        <boolean name="allow_hold_video_call_bool" value="false" />
-        <boolean name="vilte_data_is_metered_bool" value="false" />
-        <boolean name="hide_enabled_5g_bool" value="false" />
-        <boolean name="support_adhoc_conference_calls_bool" value="true" />
-        <boolean name="support_add_conference_participants_bool" value="true" />
         <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
-        <boolean name="carrier_video_crs_supported_bool" value="true" />
-        <boolean name="carrier_call_progress_notification" value="true" />
-        <boolean name="transmit_static_image" value="true" />
-        <boolean name="show_static_image_ui" value="true" />
-        <boolean name="carrier_support_send_media_configs_to_radio_layer_bool" value="true" />
-        <int-array name="carrier_nr_availabilities_int_array" num="1">
-            <item value="1" />
-        </int-array>
-        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
-        <boolean name="vonr_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="00">
         <boolean name="rtt_auto_upgrade_bool" value="true" />
@@ -1943,7 +1840,6 @@
         <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
         <boolean name="carrier_call_composer_supported_bool" value="true" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
-        <boolean name="carrier_b2c_enriched_calling_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="01">
         <boolean name="rtt_auto_upgrade_bool" value="true" />
@@ -1957,7 +1853,6 @@
         <boolean name="carrier_volte_tty_supported_bool" value="true" />
         <boolean name="gsm_cdma_calls_can_be_hd_audio" value="true" />
         <boolean name="carrier_call_composer_supported_bool" value="true" />
-        <boolean name="carrier_b2c_enriched_calling_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="030">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -2122,11 +2017,6 @@
         <boolean name="allow_merging_rtt_calls_bool" value="true" />
         <boolean name="carrier_volte_tty_supported_bool" value="false" />
         <boolean name="carrier_allow_turnoff_ims_bool" value="false" />
-        <string-array name="emergency_number_prefix_string_array" num="2">
-            <item value="*67" />
-            <item value="*82" />
-        </string-array>
-        <boolean name="carrier_supports_caller_id_vertical_service_codes_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="260">
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
@@ -2138,7 +2028,6 @@
         <boolean name="carrier_call_composer_supported_bool" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
         <boolean name="force_home_network_bool" value="true" />
-        <boolean name="carrier_b2c_enriched_calling_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="160">
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -2163,7 +2052,6 @@
         <boolean name="carrier_call_composer_supported_bool" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
         <boolean name="force_home_network_bool" value="true" />
-        <boolean name="carrier_b2c_enriched_calling_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="220">
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -2210,7 +2098,6 @@
         <boolean name="carrier_call_composer_supported_bool" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="false" />
         <boolean name="force_home_network_bool" value="true" />
-        <boolean name="carrier_b2c_enriched_calling_supported_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="310" mnc="490">
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -2309,16 +2196,6 @@
         <boolean name="ignore_rtt_mode_setting_bool" value="true" />
         <int name="default_rtt_mode_int" value="1" />
     </carrier_config>
-    <carrier_config device="kalama" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
-    <carrier_config device="parrot" mcc="311" mnc="480">
-        <boolean name="show_rtt_visibility_setting_bool" value="true" />
-        <boolean name="ignore_rtt_mode_setting_bool" value="true" />
-        <int name="default_rtt_mode_int" value="1" />
-    </carrier_config>
     <carrier_config mcc="312" mnc="530">
         <boolean name="rtt_supported_bool" value="true" />
         <boolean name="rtt_upgrade_supported_bool" value="true" />
@@ -2433,12 +2310,6 @@
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
-        <boolean name="rtt_supported_while_roaming_bool" value="true" />
-        <boolean name="rtt_downgrade_supported_bool" value="true" />
-        <string-array name="non_roaming_operator_string_array" num="2">
-            <item value="310260" />
-            <item value="310410" />
-        </string-array>
     </carrier_config>
     <carrier_config mcc="310" mnc="120">
         <boolean name="rtt_supported_bool" value="true" />
@@ -2472,19 +2343,14 @@
         <boolean name="is_ims_conference_size_enforced_bool" value="true" />
         <int name="ims_conference_size_limit_int" value="5" />
     </carrier_config>
-    <carrier_config mcc="308" mnc="01">
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
-    </carrier_config>
     <carrier_config mcc="340" mnc="01">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="602" mnc="01">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
     </carrier_config>
     <carrier_config mcc="647" mnc="00">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
-        <boolean name="hide_enhanced_4g_lte_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="612" mnc="03">
         <boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
@@ -2514,51 +2380,146 @@
             <item value="3,11,9,10,15" />
         </string-array>
     </carrier_config>
-    <carrier_config mcc="999">
-        <boolean name="is_private_network" value="true" />
-    </carrier_config>
     <carrier_config operator="ALL">
         <boolean name="carrier_volte_available_bool" value="false" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <boolean name="config_oplus_show_5g_pref" value="true" />
+        <boolean name="config_oplus_4g_pref_default" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="config_update_service_status" value="false" />
         <boolean name="config_oplus_lte_preferred_for_second_slot" value="true" />
         <boolean name="config_oplus_dual_lte_available_bool" value="true" />
-        <int name="carrier_oplus_auto_nr_mode" value="1" />
+        <boolean name="show_ims_registration_status_bool" value="true" />
     </carrier_config>
-    <carrier_config operator="TEST SIM">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="00101" />
+    <carrier_config oplus4gPrefDefault="TRUE">
+        <boolean name="config_oplus_4g_pref_default" value="false" />
+        <string-array name="mcc" num="55">
+            <item value="460" />
+            <item value="001" />
+            <item value="525" />
+            <item value="466" />
+            <item value="454" />
+            <item value="440" />
+            <item value="455" />
+            <item value="502" />
+            <item value="520" />
+            <item value="510" />
+            <item value="515" />
+            <item value="452" />
+            <item value="424" />
+            <item value="420" />
+            <item value="966" />
+            <item value="427" />
+            <item value="419" />
+            <item value="426" />
+            <item value="422" />
+            <item value="655" />
+            <item value="425" />
+            <item value="647" />
+            <item value="340" />
+            <item value="208" />
+            <item value="212" />
+            <item value="228" />
+            <item value="214" />
+            <item value="222" />
+            <item value="204" />
+            <item value="234" />
+            <item value="268" />
+            <item value="505" />
+            <item value="206" />
+            <item value="530" />
+            <item value="272" />
+            <item value="262" />
+            <item value="295" />
+            <item value="270" />
+            <item value="232" />
+            <item value="240" />
+            <item value="238" />
+            <item value="244" />
+            <item value="274" />
+            <item value="242" />
+            <item value="260" />
+            <item value="284" />
+            <item value="219" />
+            <item value="230" />
+            <item value="202" />
+            <item value="216" />
+            <item value="231" />
+            <item value="293" />
+            <item value="248" />
+            <item value="247" />
+            <item value="246" />
+        </string-array>
+    </carrier_config>
+    <carrier_config oplus4gPrefDefault="TRUE">
+        <boolean name="config_oplus_4g_pref_default" value="false" />
+        <string-array name="mccmnc" num="9">
+            <item value="334020" />
+            <item value="33402" />
+            <item value="22610" />
+            <item value="22601" />
+            <item value="22605" />
+            <item value="73002" />
+            <item value="73007" />
+            <item value="73001" />
+            <item value="73010" />
+        </string-array>
+    </carrier_config>
+    <carrier_config oplus5gSupportRegion="TRUE">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+        <string-array name="mcc" num="28">
+            <item value="310" />
+            <item value="429" />
+            <item value="621" />
+            <item value="640" />
+            <item value="401" />
+            <item value="250" />
+            <item value="255" />
+            <item value="732" />
+            <item value="740" />
+            <item value="736" />
+            <item value="364" />
+            <item value="706" />
+            <item value="710" />
+            <item value="712" />
+            <item value="338" />
+            <item value="370" />
+            <item value="722" />
+            <item value="342" />
+            <item value="330" />
+            <item value="311" />
+            <item value="312" />
+            <item value="313" />
+            <item value="314" />
+            <item value="315" />
+            <item value="376" />
+            <item value="302" />
+            <item value="554" />
+            <item value="555" />
+        </string-array>
+    </carrier_config>
+    <carrier_config oplus5gSupportRegion="TRUE">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+        <string-array name="mccmnc" num="4">
+            <item value="73004" />
+            <item value="73009" />
+            <item value="73003" />
+            <item value="73023" />
         </string-array>
     </carrier_config>
     <carrier_config operator="CMCC">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <int name="carrier_oplus_auto_nr_mode" value="3" />
-        <string-array name="mccmnc" num="5">
+        <boolean name="allow_hold_call_during_emergency_bool" value="true" />
+        <string-array name="mccmnc" num="6">
             <item value="46000" />
             <item value="46002" />
             <item value="46004" />
             <item value="46007" />
             <item value="46008" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="CBN">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="disable_filter_out_conference_host" value="false" />
-        <boolean name="carrier_config_vonr_state" value="false" />
-        <boolean name="carrier_config_vonr_visible" value="true" />
-        <int name="carrier_support_bwp" value="1" />
-        <int name="carrier_oplus_auto_nr_mode" value="3" />
-        <string-array name="mccmnc" num="1">
-            <item value="46015" />
+            <item value="46013" />
         </string-array>
     </carrier_config>
     <carrier_config operator="CT">
@@ -2569,14 +2530,13 @@
         <boolean name="disable_filter_out_conference_host" value="false" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="use_usim_bool" value="true" />
-        <int name="carrier_oplus_auto_nr_mode" value="3" />
-        <string-array name="mccmnc" num="8">
+        <boolean name="allow_hold_call_during_emergency_bool" value="true" />
+        <string-array name="mccmnc" num="7">
             <item value="46003" />
             <item value="46011" />
             <item value="46005" />
             <item value="46012" />
             <item value="45502" />
-            <item value="45507" />
             <item value="46059" />
             <item value="46099" />
         </string-array>
@@ -2592,7 +2552,7 @@
             <item value="-12" />
         </int-array>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <int name="carrier_oplus_auto_nr_mode" value="3" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="true" />
         <string-array name="mccmnc" num="3">
             <item value="46001" />
             <item value="46006" />
@@ -2640,19 +2600,31 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
+        <string-array name="mccmnc" num="3">
             <item value="45406" />
+            <item value="45415" />
+            <item value="45417" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="CHT">
+    <carrier_config operator="CUHK">
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <int name="oplus.operator.ringtone" value="2" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_hide_2g_only" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="1">
-            <item value="46692" />
+            <item value="45407" />
+        </string-array>
+    </carrier_config>
+    <carrier_config iccid="8985207" operator="CUHK">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="46001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="CTMO">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="45507" />
         </string-array>
     </carrier_config>
     <carrier_config operator="FET">
@@ -2667,17 +2639,18 @@
             <item value="46602" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="TWM">
+    <carrier_config operator="APTG">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_hide_2g_only" value="true" />
-        <int name="oplus.operator.ringtone" value="2" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
+        <string-array name="gsm_nonroaming_networks_string_array" num="1">
             <item value="46697" />
         </string-array>
+        <string-array name="mccmnc" num="1">
+            <item value="46605" />
+        </string-array>
     </carrier_config>
     <carrier_config gid1="0A" mcc="525" mnc="05">
         <string-array name="gsm_nonroaming_networks_string_array" num="1">
@@ -2688,471 +2661,164 @@
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
     </carrier_config>
-    <carrier_config operator="SUNRISE">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="22802" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Spain-VDF">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="config_oplus_show_3g_only" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="21401" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="France-Bouygues">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="3">
-            <item value="20820" />
-            <item value="20821" />
-            <item value="20888" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="France-FREE">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="20815" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="France-ORANGE" spn="Orange F">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">PRD-IR92/12 term-[B]/[P]-[V]</string>
-        <string name="config_ims_package_override_string">com.google.android.ims</string>
-        <string-array name="mccmnc" num="4">
-            <item value="20801" />
-            <item value="20802" />
-            <item value="20829" />
-            <item value="20891" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="France-SFR">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string name="config_ims_package_override_string">com.google.android.ims</string>
-        <boolean name="call_barring_visibility_bool" value="false" />
-        <string-array name="mccmnc" num="4">
-            <item value="20809" />
-            <item value="20810" />
-            <item value="20811" />
-            <item value="20813" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Italy-TIM">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="22201" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Italy-VDF">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
-        <string-array name="mccmnc" num="1">
-            <item value="22210" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="UK-EE">
+    <carrier_config operator="TWM">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="config_oplus_hide_2g_only" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
+        <int name="oplus.operator.ringtone" value="2" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="config_ims_package_override_string">com.google.android.ims</string>
-        <string-array name="mccmnc" num="8">
-            <item value="23430" />
-            <item value="23431" />
-            <item value="23432" />
-            <item value="23433" />
-            <item value="23434" />
-            <item value="23486" />
-            <item value="23501" />
-            <item value="23502" />
+        <string-array name="mccmnc" num="1">
+            <item value="46697" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="3 UK">
+    <carrier_config operator="CHT">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="2" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="plmn_name_override">46605,GT 4G</string>
+        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="46692" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="TST">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <int name="oplus.operator.ringtone" value="2" />
+        <string-array name="mccmnc" num="1">
+            <item value="46689" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SINGTEL">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="1" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="true" />
         <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="2">
-            <item value="23420" />
-            <item value="23594" />
+        <boolean name="config_reset_clir_mode_bool" value="true" />
+        <int name="carrier_oplus_auto_nr_mode" value="3" />
+        <boolean name="wfc_disable_nrsa_config" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="52501" />
         </string-array>
     </carrier_config>
-    <carrier_config gid1="0303" operator="3 UK">
+    <carrier_config operator="STARHUB">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <int name="carrier_oplus_auto_nr_mode" value="3" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="52505" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="M1">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <int name="carrier_oplus_auto_nr_mode" value="3" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="52503" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="TPG">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="1">
-            <item value="23420" />
+            <item value="52510" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="UK-Telefonica(O2)">
+    <carrier_config operator="TELSTRA">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="3" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
+        <boolean name="config_oplus_show_3g_only" value="true" />
+        <boolean name="support_1x_incall_mmi" value="true" />
+        <string name="carrier_ims_user_agent">Telstra ONEPLUS [M] [A] [S]_[D]</string>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="config_ims_package_override_string">com.google.android.ims</string>
-        <string name="carrier_ims_user_agent">OnePlus [M] [S]</string>
         <string-array name="mccmnc" num="3">
-            <item value="23402" />
-            <item value="23410" />
-            <item value="23411" />
+            <item value="50501" />
+            <item value="50571" />
+            <item value="50572" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="UK-VDF">
+    <carrier_config operator="OPTUS">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <int name="oplus.operator.ringtone" value="3" />
+        <boolean name="oplus_use_local_holdtone_for_volte_call" value="true" />
+        <int name="oplus_local_holdtone_type" value="1" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[A]_[S]_[D]</string>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="2">
-            <item value="23415" />
-            <item value="23591" />
+            <item value="50502" />
+            <item value="50590" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="UK-VIRGIN">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="support_ims_conference_call_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="config_oplus_hide_2g_only" value="false" />
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string-array name="mccmnc" num="1">
-            <item value="23438" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="28" operator="UK-VIRGIN">
+    <carrier_config imsi="505029" operator="OPTUS">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_support_viwifi_bool" value="false" />
-        <boolean name="support_ims_conference_call_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="config_oplus_hide_2g_only" value="false" />
-        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string-array name="mccmnc" num="1">
-            <item value="23430" />
+        <string-array name="mccmnc" num="2">
+            <item value="50502" />
+            <item value="50590" />
         </string-array>
     </carrier_config>
-    <carrier_config gid1="508" operator="GIFFGAFF">
+    <carrier_config operator="VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="oplus_use_local_holdtone_for_vilte_call" value="true" />
+        <int name="oplus_local_holdtone_type" value="1" />
+        <int name="oplus.operator.ringtone" value="3" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="3">
+            <item value="50503" />
+            <item value="50506" />
+            <item value="50507" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="01f" operator="VDF">
         <boolean name="carrier_volte_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
-        <string-array name="mccmnc" num="1">
-            <item value="23410" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Netherland-T mobile">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
-        <boolean name="config_oplus_ut_support_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="show_ims_registration_status_bool" value="true" />
-        <boolean name="force_home_network_bool" value="false" />
-        <string-array name="mccmnc" num="1">
-            <item value="20416" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="5F" operator="Netherland-Ben">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
-        <boolean name="config_oplus_ut_support_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <boolean name="show_ims_registration_status_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="20416" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Netherland-VDF">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <boolean name="show_ims_registration_status_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="20404" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="4E4C" operator="Tele2-NL">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="20416" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="8F" operator="Tele2-NL">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="20416" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Netherland-KPN">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="show_ims_registration_status_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="20408" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Poland-DT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <boolean name="config_oplus_ut_support_bool" value="true" />
-        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <boolean name="show_ims_registration_status_bool" value="true" />
-        <boolean name="force_home_network_bool" value="false" />
-        <string-array name="mccmnc" num="1">
-            <item value="26002" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Poland-PLAY">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
-        <boolean name="carrier_not_support_optimized_nr_icon" value="true" />
-        <string-array name="mccmnc" num="2">
-            <item value="26006" />
-            <item value="26098" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Romania-Orange">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="22610" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Romania-VDF">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_support_viwifi_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string-array name="mccmnc" num="1">
-            <item value="22601" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Belgium-Proximus">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_oplus_support_viwifi_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">PRD-IR92/15 term-[B]/[P] device-type/smart-phone mno-custom/ProximusXCAPv2 ;3gpp-gba</string>
-        <string-array name="mccmnc" num="1">
-            <item value="20601" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Germany-VDF">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
-        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
-        <boolean name="config_oplus_hide_callbarring_change_passwd" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string-array name="carrier_metered_apn_types_strings" num="3">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-        </string-array>
-        <string-array name="mccmnc" num="2">
-            <item value="26202" />
-            <item value="26209" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Germany-T-Mobile">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <boolean name="config_oplus_ut_support_bool" value="true" />
-        <boolean name="show_ims_registration_status_bool" value="true" />
-        <boolean name="show_iccid_in_sim_status_bool" value="true" />
-        <string-array name="carrier_metered_apn_types_strings" num="3">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-        </string-array>
-        <string-array name="mccmnc" num="2">
-            <item value="26201" />
-            <item value="26206" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Germany-Telefonica">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_support_viwifi_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
-        <string-array name="carrier_metered_apn_types_strings" num="3">
-            <item value="default" />
-            <item value="dun" />
-            <item value="supl" />
-        </string-array>
-        <string-array name="mccmnc" num="7">
-            <item value="26203" />
-            <item value="26205" />
-            <item value="26207" />
-            <item value="26208" />
-            <item value="26211" />
-            <item value="26217" />
-            <item value="26277" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Three">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="2">
-            <item value="27205" />
-            <item value="27202" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="DT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="default_vm_number_string">+38598151100</string>
-        <boolean name="show_iccid_in_sim_status_bool" value="true" />
-        <boolean name="display_hd_audio_property_bool" value="false" />
-        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="21901" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="VDF-CZ">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_support_viwifi_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string-array name="mccmnc" num="2">
-            <item value="23003" />
-            <item value="23099" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="DT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="force_home_network_bool" value="false" />
-        <string-array name="mccmnc" num="1">
-            <item value="23001" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="VDF-GR">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string-array name="mccmnc" num="1">
-            <item value="20205" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="DT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="20201" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="VDF-HU">
-        <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
-        <string-array name="mccmnc" num="1">
-            <item value="21670" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="DT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">[B]_[V]</string>
-        <string-array name="mccmnc" num="1">
-            <item value="21630" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Orange-SK">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="23101" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Slovakia-DT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="23102" />
+        <string-array name="mccmnc" num="3">
+            <item value="50503" />
+            <item value="50506" />
+            <item value="50507" />
         </string-array>
     </carrier_config>
     <carrier_config operator="Austria A1">
@@ -3160,8 +2826,8 @@
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
         <string-array name="mccmnc" num="1">
             <item value="23201" />
         </string-array>
@@ -3175,19 +2841,23 @@
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="config_oplus_ut_support_bool" value="true" />
         <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <string name="wfc_spn_customize">WLAN-Call</string>
         <string-array name="mccmnc" num="2">
             <item value="23203" />
             <item value="23207" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="Denmark-TDC">
+    <carrier_config operator="H3G">
         <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="23801" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string-array name="mccmnc" num="3">
+            <item value="23205" />
+            <item value="23210" />
+            <item value="23214" />
         </string-array>
     </carrier_config>
     <carrier_config operator="Denmark-3 DK">
@@ -3200,16 +2870,15 @@
             <item value="23806" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="Denmark-Telia DK">
+    <carrier_config operator="Denmark-TDC">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string name="carrier_ims_user_agent">[M] [P] [V]</string>
         <string-array name="mccmnc" num="2">
-            <item value="23820" />
-            <item value="23830" />
+            <item value="23801" />
+            <item value="23810" />
         </string-array>
     </carrier_config>
     <carrier_config operator="Denmark-Telenor DK">
@@ -3223,10 +2892,24 @@
             <item value="238002" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="ETISATAT">
+    <carrier_config operator="Denmark-Telia DK">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[M] [P] [V]</string>
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
+        <string-array name="mccmnc" num="2">
+            <item value="23820" />
+            <item value="23830" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Latvia-LMT">
+        <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="1">
-            <item value="42402" />
+            <item value="24701" />
         </string-array>
     </carrier_config>
     <carrier_config operator="Estonia-Elisa">
@@ -3236,6 +2919,7 @@
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_show_video_call_forward" value="true" />
         <string-array name="mccmnc" num="1">
             <item value="24802" />
         </string-array>
@@ -3284,17 +2968,11 @@
         <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string name="carrier_ims_user_agent">[M] [P] [V]</string>
+        <boolean name="gsm_cdma_calls_can_be_hd_audio" value="false" />
         <string-array name="mccmnc" num="1">
             <item value="24491" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="LMT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="1">
-            <item value="24701" />
-        </string-array>
-    </carrier_config>
     <carrier_config operator="Lithunia-Telia">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="false" />
@@ -3302,12 +2980,56 @@
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="tty_supported_bool" value="true" />
         <string name="carrier_ims_user_agent">[M] [P] [V]</string>
         <string-array name="mccmnc" num="1">
             <item value="24601" />
         </string-array>
     </carrier_config>
+    <carrier_config operator="Latvia-BITE">
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="24602" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Slovenia-SLO Telekom">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="29341" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Slovenia-A1">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="29340" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Macedonia-Magyar">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="29401" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Iceland-Nova">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="27411" />
+        </string-array>
+    </carrier_config>
     <carrier_config operator="Norway-Telia">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -3316,8 +3038,9 @@
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <string name="carrier_ims_user_agent">[M] [P] [V]</string>
-        <string-array name="mccmnc" num="1">
+        <string-array name="mccmnc" num="2">
             <item value="24202" />
+            <item value="24205" />
         </string-array>
     </carrier_config>
     <carrier_config operator="Norway-Telenor">
@@ -3337,7 +3060,6 @@
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <string-array name="mccmnc" num="2">
             <item value="24206" />
             <item value="24214" />
@@ -3384,28 +3106,839 @@
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <int name="oplus.operator.ringtone" value="1" />
         <string name="carrier_ims_user_agent">[M] [P] [V]</string>
-        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <string-array name="mccmnc" num="1">
             <item value="24001" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="Iceland-Nova">
+    <carrier_config operator="2DEGREE">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="4" />
+        <boolean name="always_play_remote_hold_tone_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="53024" />
+        </string-array>
+    </carrier_config>
+    <carrier_config imsi="5302410" operator="Warehouse">
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="53024" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="VDF-NZ">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="support_video_conference_call_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="false" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <int name="oplus.operator.ringtone" value="3" />
+        <boolean name="oplus_use_local_holdtone_for_volte_call" value="true" />
+        <boolean name="oplus_use_local_holdtone_for_vilte_call" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="53001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SPARK">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="4" />
+        <boolean name="oplus_use_local_holdtone_for_volte_call" value="true" />
+        <boolean name="oplus_use_local_holdtone_for_vilte_call" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="53005" />
+            <item value="53099" />
+        </string-array>
+    </carrier_config>
+    <carrier_config imsi="53005204" operator="Skinny">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="oplus_use_local_holdtone_for_volte_call" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="53005" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SWISSCOM">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="4" />
+        <string-array name="mccmnc" num="1">
+            <item value="22801" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SUNRISE">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="22802" />
+            <item value="22812" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SALT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="2">
+            <item value="22803" />
+            <item value="29502" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_oplus_show_3g_only" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21401" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-ORANGE">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="21403" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-ORANGE" spn="Orange">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="21403" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-Telefonica">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="support_video_conference_call_bool" value="false" />
+        <boolean name="config_oplus_show_5g_pref" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="21405" />
+            <item value="21407" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-ORANGE" spn="Republica Movil">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="21403" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-ORANGE" spn="simyo">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="21403" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Jazztel">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="21421" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-ORANGE" spn="JAZZTEL">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="21421" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Spain-Yoigo">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21404" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="France-Bouygues">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="3">
+            <item value="20820" />
+            <item value="20821" />
+            <item value="20888" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="France-ORANGE" spn="Orange F">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
+        <string-array name="mccmnc" num="4">
+            <item value="20801" />
+            <item value="20802" />
+            <item value="20829" />
+            <item value="20891" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="France-SFR">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <string-array name="mccmnc" num="5">
+            <item value="20809" />
+            <item value="20810" />
+            <item value="20811" />
+            <item value="20813" />
+            <item value="64710" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="France-FREE">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="3">
+            <item value="20815" />
+            <item value="20816" />
+            <item value="20835" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="France-Monaco">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="carrier_vt_available_bool" value="false" />
         <string-array name="mccmnc" num="1">
-            <item value="27411" />
+            <item value="21210" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Italy-TIM">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="22201" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Italy-VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="22210" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Italy-WINDTRE">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="oplus_use_local_holdtone_for_volte_call" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="22288" />
+            <item value="22299" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Italy-FASTWEB">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="22208" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="UK-EE">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <string-array name="mccmnc" num="8">
+            <item value="23430" />
+            <item value="23431" />
+            <item value="23432" />
+            <item value="23433" />
+            <item value="23434" />
+            <item value="23486" />
+            <item value="23501" />
+            <item value="23502" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="3 UK">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B] [P] QCOM IR92v11.0</string>
+        <string-array name="mccmnc" num="2">
+            <item value="23420" />
+            <item value="23594" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="0303" operator="3 UK">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="23420" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="UK-Telefonica(O2)">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <string name="carrier_ims_user_agent">ONEPLUS [M] [S]</string>
+        <string-array name="mccmnc" num="3">
+            <item value="23402" />
+            <item value="23410" />
+            <item value="23411" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="UK-VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="23415" />
+            <item value="23591" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="UK-VIRGIN">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="false" />
+        <boolean name="support_ims_conference_call_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="23438" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="28" operator="UK-VIRGIN">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
+        <boolean name="config_oplus_hide_2g_only" value="false" />
+        <boolean name="support_ims_conference_call_bool" value="false" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="23430" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="UK-SKY">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <int name="oplus.operator.ringtone" value="1" />
+        <string-array name="mccmnc" num="1">
+            <item value="23457" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="0c" operator="UK-SKY">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <int name="oplus.operator.ringtone" value="1" />
+        <string-array name="mccmnc" num="1">
+            <item value="24007" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Netherland-T mobile">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="show_ims_registration_status_bool" value="true" />
+        <boolean name="editable_voicemail_number_setting_bool" value="false" />
+        <boolean name="force_home_network_bool" value="false" />
+        <string-array name="mccmnc" num="2">
+            <item value="20416" />
+            <item value="20420" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Netherland-VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="20404" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="4E4C" operator="Tele2-NL">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="20416" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="8F" operator="Tele2-NL">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="20416" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="4E4C" operator="Tele2-NL">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="show_ims_registration_status_bool" value="true" />
+        <string name="carrier_ims_user_agent">[P]_[H]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="20402" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="10" operator="Croatia-DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21920" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="11" operator="Croatia-DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21920" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="12" operator="Croatia-DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21920" />
+        </string-array>
+    </carrier_config>
+    <carrier_config iccid="8986" operator="CT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="20404" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Netherland-KPN">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="3">
+            <item value="20408" />
+            <item value="20412" />
+            <item value="20418" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Netherland-KPN-LAB">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string name="default_vm_number_string">1233</string>
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="20469" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Poland-Orange">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <string-array name="mccmnc" num="2">
+            <item value="26003" />
+            <item value="26005" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Poland-PLAY">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <boolean name="carrier_not_support_optimized_nr_icon" value="true" />
+        <string-array name="mccmnc" num="3">
+            <item value="26006" />
+            <item value="26007" />
+            <item value="26098" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="PL-Plus">
+        <int name="carrier_customized_nricon_config" value="1" />
+        <string-array name="mccmnc" num="3">
+            <item value="26012" />
+            <item value="26015" />
+            <item value="26017" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Poland-DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]_[D]</string>
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <boolean name="show_ims_registration_status_bool" value="true" />
+        <boolean name="force_home_network_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="26002" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Bulgaria-A1">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="28401" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Bulgaria-Telenor">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <string-array name="mccmnc" num="2">
+            <item value="28405" />
+            <item value="284005" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Serbia-A1">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="22005" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Serbia-MTS">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="22003" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Romania-Orange">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <boolean name="config_oplus_show_5g_pref" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="22610" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Romania-VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="config_oplus_show_5g_pref" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="22601" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Romania-Digi">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="22605" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Portugal-Vodafone">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="26801" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Portugal-MEO">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="26806" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Portugal-NOS">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS [M] [A] [S] [D]</string>
+        <string-array name="mccmnc" num="6">
+            <item value="26803" />
+            <item value="26889" />
+            <item value="26893" />
+            <item value="26897" />
+            <item value="26898" />
+            <item value="26899" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Belgium-Orange">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="20610" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Belgium-Telenet">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="20605" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Belgium-Base">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="20620" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Belgium-Proximus">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="20601" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Germany-VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="config_oplus_hide_callbarring_change_passwd" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <string-array name="mccmnc" num="2">
+            <item value="26202" />
+            <item value="26209" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Germany-T-Mobile">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="show_ims_registration_status_bool" value="true" />
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <string-array name="mccmnc" num="2">
+            <item value="26201" />
+            <item value="26206" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="44" operator="Congstart Germany">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <int name="wfc_spn_format_idx_int" value="2" />
+        <string name="default_vm_number_string">3311</string>
+        <string-array name="mccmnc" num="1">
+            <item value="26201" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Germany-Telefonica">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string name="nfw_proxy_apps" value="com.coloros.locationproxy" />
+        <string-array name="carrier_metered_apn_types_strings" num="3">
+            <item value="default" />
+            <item value="dun" />
+            <item value="supl" />
+        </string-array>
+        <string-array name="mccmnc" num="7">
+            <item value="26203" />
+            <item value="26205" />
+            <item value="26207" />
+            <item value="26208" />
+            <item value="26211" />
+            <item value="26217" />
+            <item value="26277" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Ireland-VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <boolean name="config_oplus_support_viwifi_bool" value="false" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="27201" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Ireland-Eir">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="27203" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Luxembourg-Orange">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="27099" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Luxembourg-POST">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="27001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Luxembourg-Tango">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="27077" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Moldova-Orange">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="25901" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Indonesia-SMARTFREN">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="config_oplus_ut_support_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="51009" />
+            <item value="51028" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Indonesia-Telkomsel">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="51010" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Indonesia-Indosat">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="51001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Indonesia-XL">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="51011" />
+            <item value="51008" />
         </string-array>
     </carrier_config>
     <carrier_config operator="Viettel">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
         <string-array name="mccmnc" num="1">
             <item value="45204" />
         </string-array>
     </carrier_config>
+    <carrier_config operator="Vietnamobile">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="45205" />
+        </string-array>
+    </carrier_config>
     <carrier_config operator="Vinaphone">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -3417,9 +3950,15 @@
             <item value="45202" />
         </string-array>
     </carrier_config>
+    <carrier_config operator="3-Ireland">
+        <string-array name="mccmnc" num="2">
+            <item value="27202" />
+            <item value="27205" />
+        </string-array>
+    </carrier_config>
     <carrier_config operator="Globe">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="1">
@@ -3427,22 +3966,33 @@
         </string-array>
     </carrier_config>
     <carrier_config operator="Smart">
-        <boolean name="carrier_volte_available_bool" value="false" />
-        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
         <string-array name="mccmnc" num="1">
             <item value="51503" />
         </string-array>
     </carrier_config>
+    <carrier_config operator="Dito">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="config_oplus_support_viwifi_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="51566" />
+        </string-array>
+    </carrier_config>
     <carrier_config operator="AIS">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="config_oplus_support_viwifi_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_show_video_call_forward" value="true" />
         <string-array name="mccmnc" num="2">
             <item value="52001" />
             <item value="52003" />
@@ -3465,52 +4015,276 @@
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_show_conf_for_part_bool" value="true" />
+        <boolean name="oplus_config_ignore_display_text_bool" value="true" />
         <string-array name="mccmnc" num="2">
             <item value="52000" />
             <item value="52004" />
         </string-array>
     </carrier_config>
+    <carrier_config imsi="5302410" operator="Warehouse">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="53024" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="DIGI">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="5" />
+        <string-array name="mccmnc" num="2">
+            <item value="50216" />
+            <item value="50210" />
+        </string-array>
+    </carrier_config>
+    <carrier_config imsi="502161081" operator="DIGI">
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <string-array name="mccmnc" num="2">
+            <item value="50216" />
+            <item value="50210" />
+        </string-array>
+    </carrier_config>
     <carrier_config operator="YES">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="oplus_use_local_holdtone_for_volte_call" value="true" />
         <int name="oplus_local_holdtone_type" value="2" />
         <boolean name="config_oplus_ut_support_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="5" />
         <string-array name="mccmnc" num="1">
             <item value="502152" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="SINGTEL">
+    <carrier_config operator="WEBE">
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <int name="oplus.operator.ringtone" value="1" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_hide_2g_only" value="true" />
-        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
-        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <boolean name="config_reset_clir_mode_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <int name="oplus.operator.ringtone" value="5" />
         <string-array name="mccmnc" num="1">
-            <item value="52501" />
+            <item value="502153" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="STARHUB">
+    <carrier_config operator="Celcom">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="5" />
+        <string-array name="mccmnc" num="2">
+            <item value="50213" />
+            <item value="50219" />
+        </string-array>
+    </carrier_config>
+    <carrier_config imsi="502195[5-9]" operator="Celcom">
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <string-array name="mccmnc" num="2">
+            <item value="50213" />
+            <item value="50219" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="UMobile">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_hide_2g_only" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <int name="oplus.operator.ringtone" value="5" />
         <string-array name="mccmnc" num="1">
-            <item value="52505" />
+            <item value="50218" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="M1">
+    <carrier_config operator="Maxis">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <int name="oplus.operator.ringtone" value="5" />
+        <string-array name="mccmnc" num="2">
+            <item value="50212" />
+            <item value="50217" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="21901" />
+            <item value="21920" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="10" operator="T-Mobile HR(Croatia)">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21901" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="11" operator="T-Mobile HR(Croatia)">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21901" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="12" operator="T-Mobile HR(Croatia)">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="21901" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="force_home_network_bool" value="false" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="23001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="O2">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="23002" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="20201" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Slovakia-DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="23102" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Slovakia-Telefonica">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="23106" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Slovakia-4Ka">
+        <string-array name="mccmnc" num="1">
+            <item value="23103" />
+        </string-array>
+        <string-array name="non_roaming_operator_string_array" num="2">
+            <item value="23101" />
+            <item value="23105" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Orange-SK">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="23101" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="DT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">[B]_[P]_[H]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="21630" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Telenor">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="false" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_hide_2g_only" value="true" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
         <string-array name="mccmnc" num="1">
-            <item value="52503" />
+            <item value="21601" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="VDF-CZ">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="2">
+            <item value="23003" />
+            <item value="23099" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="VDF-GR">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="20205" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="VDF-HU">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="21670" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SMART">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="45605" />
+            <item value="45606" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SEATEL">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="45611" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Cellcard">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="45601" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Metfone">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="45608" />
         </string-array>
     </carrier_config>
     <carrier_config operator="JIO">
@@ -3521,18 +4295,24 @@
         <boolean name="support_video_conference_call_bool" value="true" />
         <boolean name="oplus_support_video_cf_bool" value="true" />
         <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]_[D]</string>
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]_[D]</string>
         <boolean name="carrier_name_override_bool" value="false" />
         <boolean name="editable_wfc_mode_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <boolean name="config_oplus_show_5g_pref" value="true" />
         <boolean name="config_oplus_4g_pref_default" value="false" />
-        <boolean name="vonr_enabled_bool" value="false" />
-        <boolean name="vonr_setting_visibility_bool" value="true" />
+        <int name="config_oplus_5g_pref_default" value="1" />
+        <boolean name="carrier_config_vonr_state" value="false" />
+        <boolean name="carrier_config_vonr_visible" value="true" />
         <int name="carrier_oplus_auto_nr_mode" value="3" />
+        <int-array name="carrier_nr_availabilities_int_array" num="2">
+            <item value="1" />
+            <item value="2" />
+        </int-array>
         <boolean name="oplus_carrier_call_disable_endc" value="true" />
+        <boolean name="wfc_disable_nrsa_config" value="true" />
         <string-array name="mccmnc" num="22">
             <item value="405840" />
             <item value="405854" />
@@ -3557,7 +4337,7 @@
             <item value="405873" />
             <item value="405874" />
         </string-array>
-		<!-- PA: Do not allow 5G NSA on Jio -->
+		<!-- Do not allow 5G NSA on Jio -->
         	<int-array name="carrier_nr_availabilities_int_array" num="1">
             		<item value="2" />
         	</int-array>
@@ -3570,9 +4350,12 @@
         <boolean name="config_oplus_support_viwifi_bool" value="true" />
         <int name="oplus.operator.ringtone" value="1" />
         <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <boolean name="oplus_support_video_cf_bool" value="true" />
+        <boolean name="config_oplus_show_video_call_forward" value="true" />
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <string-array name="mccmnc" num="24">
             <item value="40400" />
             <item value="40402" />
@@ -3610,7 +4393,8 @@
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]_[D]</string>
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]_[D]</string>
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <string-array name="mccmnc" num="23">
             <item value="40401" />
             <item value="40405" />
@@ -3644,9 +4428,10 @@
         <boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
         <boolean name="config_oplus_support_viwifi_bool" value="true" />
         <boolean name="config_disable_clir_over_ut" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]</string>
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="editable_wfc_roaming_mode_bool" value="true" />
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <string-array name="mccmnc" num="28">
             <item value="40404" />
             <item value="40407" />
@@ -3683,7 +4468,8 @@
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
-        <string name="carrier_ims_user_agent">OnePlus_[M]_[S]_[D]</string>
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]_[D]</string>
+        <boolean name="carrier_allow_transfer_ims_call_bool" value="false" />
         <string-array name="mccmnc" num="22">
             <item value="40434" />
             <item value="40438" />
@@ -3709,12 +4495,72 @@
             <item value="40481" />
         </string-array>
     </carrier_config>
+    <carrier_config operator="ETISATAT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="config_disable_clir_over_ut" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="42402" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Du">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="42403" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Ooredoo">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <boolean name="config_oplus_show_video_call_forward" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="42701" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="VDF">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="42702" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="ETISALAT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="60203" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Egypt-Orange">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="60201" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Egypt-Vodafone">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="60202" />
+        </string-array>
+    </carrier_config>
     <carrier_config operator="Kuwait-Ooredoo">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
         <boolean name="config_oplus_support_viwifi_bool" value="false" />
         <boolean name="config_oplus_show_video_call_forward" value="true" />
+        <boolean name="oplus_support_video_cf_bool" value="true" />
         <string-array name="mccmnc" num="1">
             <item value="41903" />
         </string-array>
@@ -3731,15 +4577,116 @@
     <carrier_config operator="Kuwait-Viva">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
         <boolean name="config_oplus_support_viwifi_bool" value="false" />
         <boolean name="carrier_name_override_bool" value="true" />
         <string name="carrier_name_string">stc KW</string>
-        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
         <string-array name="mccmnc" num="1">
             <item value="41904" />
         </string-array>
     </carrier_config>
+    <carrier_config operator="Bahrain-Batelco">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_allow_ussd_in_volte_call" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="42601" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Bahrain-Viva">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="false" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="42604" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Bahrain-Zain">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="42602" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Omantel">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="false" />
+        <string-array name="mccmnc" num="1">
+            <item value="42202" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="MTN">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="65510" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Telkom">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="65502" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Vodacom">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="carrier_ims_user_agent">ONEPLUS_[M]_[S]</string>
+        <string-array name="mccmnc" num="1">
+            <item value="65501" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="CellC">
+        <boolean name="carrier_volte_available_bool" value="false" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <string-array name="non_roaming_operator_string_array" num="2">
+            <item value="65501" />
+            <item value="65510" />
+        </string-array>
+        <string-array name="mccmnc" num="1">
+            <item value="65507" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="AMX-TELCEL">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="config_oplus_support_viwifi_bool" value="false" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="config_oplus_disable_clir_hide_number" value="true" />
+        <boolean name="voicemail_notification_persistent_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <int name="oplus_use_telcel_busy_tone" value="1" />
+        <string-array name="mccmnc" num="1">
+            <item value="334020" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="MX-ATT">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="334050" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="MX-Telefonica">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="334030" />
+        </string-array>
+    </carrier_config>
     <carrier_config operator="Israel Partner">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="true" />
@@ -3778,45 +4725,197 @@
         <boolean name="config_oplus_support_viwifi_bool" value="false" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="editable_wfc_mode_bool" value="true" />
         <string-array name="mccmnc" num="1">
             <item value="42507" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="AMX-TELCEL">
+    <carrier_config operator="JIO">
+        <boolean name="config_oplus_hide_3g_2g" value="true" />
+        <string-array name="mccmnc" num="22">
+            <item value="405840" />
+            <item value="405854" />
+            <item value="405855" />
+            <item value="405856" />
+            <item value="405857" />
+            <item value="405858" />
+            <item value="405859" />
+            <item value="405860" />
+            <item value="405861" />
+            <item value="405862" />
+            <item value="405863" />
+            <item value="405864" />
+            <item value="405865" />
+            <item value="405866" />
+            <item value="405867" />
+            <item value="405868" />
+            <item value="405869" />
+            <item value="405870" />
+            <item value="405871" />
+            <item value="405872" />
+            <item value="405873" />
+            <item value="405874" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="SEATEL">
+        <boolean name="config_oplus_hide_3g_2g" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="45611" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="YES">
+        <boolean name="config_oplus_hide_3g_2g" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="502152" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="UK EE">
+        <string-array name="mccmnc" num="2">
+            <item value="23430" />
+            <item value="23433" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="TR Turkcell">
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="28601" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="3 UK">
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <string-array name="mccmnc" num="2">
+            <item value="23420" />
+            <item value="23594" />
+        </string-array>
+    </carrier_config>
+    <carrier_config gid1="0305" operator="3 UK">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
         <boolean name="config_oplus_sms_ims_support_bool" value="true" />
-        <boolean name="config_oplus_support_viwifi_bool" value="true" />
-        <boolean name="carrier_vt_available_bool" value="true" />
-        <boolean name="config_oplus_disable_clir_hide_number" value="true" />
-        <boolean name="voicemail_notification_persistent_bool" value="true" />
-        <string name="config_ims_package_override_string">com.google.android.ims</string>
-        <int name="oplus_use_telcel_busy_tone" value="1" />
+        <boolean name="config_oplus_hide_cancel_all_callbarring" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="1">
-            <item value="334020" />
+            <item value="23420" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="O2 - UK">
+        <boolean name="config_oplus_hide_2g_only" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="23410" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="TPG">
+        <boolean name="config_oplus_hide_3g_2g" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="52510" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="TEST SIM">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="00101" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="TEST SIM" spn="null">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="001001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="TEST SIM" spn="^Tes.*">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="001001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config imsi="^001001.*" operator="TEST SIM">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="001001" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="France-ORANGE">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <boolean name="carrier_wfc_ims_available_bool" value="true" />
+        <boolean name="config_oplus_sms_ims_support_bool" value="true" />
+        <string name="config_ims_package_override_string">com.google.android.ims</string>
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
+        <boolean name="allow_hold_call_during_emergency_bool" value="false" />
+        <string-array name="mccmnc" num="4">
+            <item value="20801" />
+            <item value="20802" />
+            <item value="20829" />
+            <item value="20891" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Monet-Tmobile">
+        <boolean name="show_iccid_in_sim_status_bool" value="true" />
+        <string-array name="mccmnc" num="1">
+            <item value="29702" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Zain">
+        <string-array name="mccmnc" num="2">
+            <item value="42004" />
+            <item value="42019" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="ERICSSON LAB">
+        <string-array name="mccmnc" num="7">
+            <item value="24280" />
+            <item value="24284" />
+            <item value="240680" />
+            <item value="240681" />
+            <item value="24067" />
+            <item value="24813" />
+            <item value="24077" />
+        </string-array>
+    </carrier_config>
+    <carrier_config operator="Kena Mobile">
+        <string-array name="mccmnc" num="1">
+            <item value="22207" />
+        </string-array>
+    </carrier_config>
+    <carrier_config oplus5gNotSupport="TRUE">
+        <boolean name="config_oplus_show_5g_pref" value="false" />
+    </carrier_config>
+    <carrier_config operator="Canada Rogers">
+        <boolean name="carrier_volte_available_bool" value="true" />
+        <string-array name="mccmnc" num="3">
+            <item value="302370" />
+            <item value="302720" />
+            <item value="302820" />
         </string-array>
     </carrier_config>
     <carrier_config operator="T-Mobile">
-        <string-array name="mccmnc" num="19">
-            <item value="31026" />
-            <item value="31031" />
+        <string-array name="mccmnc" num="15">
+            <item value="310260" />
+            <item value="310240" />
             <item value="310160" />
             <item value="310200" />
             <item value="310210" />
             <item value="310220" />
             <item value="310230" />
-            <item value="310240" />
             <item value="310250" />
-            <item value="310260" />
             <item value="310270" />
+            <item value="31026" />
+            <item value="31031" />
             <item value="310310" />
             <item value="310490" />
             <item value="310660" />
             <item value="310800" />
-            <item value="311490" />
-            <item value="311660" />
-            <item value="311882" />
-            <item value="312250" />
+        </string-array>
+        <string-array name="mmi_two_digit_number_pattern_string_array" num="7">
+            <item value="0" />
+            <item value="1" />
+            <item value="00" />
+            <item value="*2" />
+            <item value="*3" />
+            <item value="*4" />
+            <item value="*5" />
         </string-array>
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
@@ -3826,10 +4925,11 @@
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="rtt_supported_bool" value="true" />
         <boolean name="carrier_rtt_auto_upgrade" value="true" />
-        <boolean name="carrier_rtt_supported_on_vtcalls" value="true" />
+        <boolean name="carrier_rtt_supported_on_vtcalls" value="false" />
         <boolean name="carrier_rtt_upgrade_supported" value="true" />
         <boolean name="carrier_rtt_downgrade_supported" value="true" />
         <boolean name="carrier_name_override_bool" value="false" />
+        <boolean name="allow_emergency_video_calls_bool" value="true" />
         <int name="carrier_default_wfc_ims_mode_int" value="1" />
         <boolean name="carrier_use_ims_first_for_emergency_bool" value="true" />
         <boolean name="ignore_data_enabled_changed_for_video_calls" value="false" />
@@ -3837,63 +4937,18 @@
         <boolean name="editable_voicemail_number_setting_bool" value="false" />
         <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
         <boolean name="call_barring_visibility_bool" value="false" />
+        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string name="vendor_carrier_eons_short">TMO</string>
-        <string name="carrier_oplus_ims_user_agent">[B]/[M] [T]</string>
+        <string name="carrier_ims_user_agent">OnePlus/[M] [B]</string>
         <boolean name="use_only_rsrp_for_lte_signal_bar_bool" value="true" />
         <string name="wcdma_default_signal_strength_measurement_string">rscp</string>
         <boolean name="config_hide_vt_callforward_option" value="true" />
         <boolean name="editable_enhanced_4g_lte_bool" value="true" />
-        <boolean name="config_oplus_show_5g_pref" value="true" />
-        <boolean name="config_oplus_show_4g_pref" value="false" />
+        <boolean name="wfc_disable_nrsa_config" value="true" />
         <boolean name="show_rtt_visibility_setting_bool" value="true" />
         <boolean name="carrier_vt_available_bool" value="false" />
         <string name="carrier_name_string">T-Mobile</string>
         <boolean name="force_home_network_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-    </carrier_config>
-    <carrier_config gid1="4153" operator="Ultra">
-        <string name="carrier_name_string">Ultra</string>
-        <string-array name="mccmnc" num="1">
-            <item value="310260" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="354D" operator="Ultra">
-        <string name="carrier_name_string">Ultra</string>
-        <string-array name="mccmnc" num="1">
-            <item value="310260" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="364D" operator="Ultra">
-        <string name="carrier_name_string">Ultra</string>
-        <string-array name="mccmnc" num="1">
-            <item value="310260" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="6132" operator="Ultra">
-        <string name="carrier_name_string">Ultra</string>
-        <string-array name="mccmnc" num="1">
-            <item value="310260" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="554D" operator="Ultra">
-        <string name="carrier_name_string">Ultra</string>
-        <string-array name="mccmnc" num="1">
-            <item value="310260" />
-        </string-array>
-    </carrier_config>
-    <carrier_config gid1="756D" operator="Mint">
-        <string name="carrier_name_string">Mint</string>
-        <string-array name="mccmnc" num="1">
-            <item value="310260" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="Sprint">
-        <string-array name="mccmnc" num="2">
-            <item value="312530" />
-            <item value="310120" />
-        </string-array>
-        <boolean name="carrier_rtt_auto_upgrade" value="true" />
-        <string name="carrier_name_string">Sprint</string>
     </carrier_config>
     <carrier_config operator="ATT">
         <string-array name="mccmnc" num="14">
@@ -3919,21 +4974,14 @@
         <boolean name="config_enable_mms_with_mobile_data_off" value="true" />
         <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
     </carrier_config>
-    <carrier_config operator="MX-ATT">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="2">
-            <item value="334050" />
-            <item value="334090" />
-        </string-array>
-    </carrier_config>
     <carrier_config operator="Verizon">
-        <string-array name="mccmnc" num="5">
+        <string-array name="mccmnc" num="8">
+            <item value="310012" />
+            <item value="310028" />
             <item value="310590" />
             <item value="310890" />
             <item value="311270" />
+            <item value="311390" />
             <item value="311480" />
             <item value="312770" />
         </string-array>
@@ -3951,6 +4999,7 @@
         <boolean name="allow_adding_apns_bool" value="false" />
         <boolean name="vendor_ecc_after_radio_on_under_flight_mode" value="true" />
         <int name="volte_replacement_rat_int" value="3" />
+        <string name="carrier_name_string">Verizon</string>
         <boolean name="carrier_default_data_roaming_enabled_bool" value="true" />
         <int name="maxSubjectLength" value="80" />
         <string name="gps.lpp_profile">3</string>
@@ -3969,54 +5018,31 @@
             <item value="supl" />
             <item value="fota" />
         </string-array>
-        <string name="carrier_oplus_ims_user_agent">[B]---[P]---[V]</string>
-        <boolean name="config_oplus_show_5g_pref" value="true" />
-        <boolean name="config_oplus_show_4g_pref" value="false" />
-    </carrier_config>
-    <carrier_config gid1="BAE1000000000000" operator="Visible">
-        <string name="carrier_name_string">Visible</string>
-        <boolean name="config_oplus_show_5g_pref" value="false" />
-        <string name="httpParams">x-up-calling-line-id: 1##LINE1NOCOUNTRYCODE##|X-VzW-MDN: 1##LINE1NOCOUNTRYCODE##</string>
-        <string-array name="mccmnc" num="1">
-            <item value="311480" />
-        </string-array>
+        <string name="carrier_ims_user_agent">OnePlus---[P]---[V]</string>
     </carrier_config>
     <carrier_config operator="GCI">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_show_5g_pref" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="1">
             <item value="311370" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="TELUS">
+    <carrier_config operator="FirstNet">
         <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_show_5g_pref" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="2">
-            <item value="302220" />
-            <item value="302221" />
-        </string-array>
-    </carrier_config>
-    <carrier_config operator="BELL">
-        <boolean name="carrier_volte_available_bool" value="true" />
-        <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_show_5g_pref" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
         <string-array name="mccmnc" num="1">
-            <item value="302610" />
+            <item value="312670" />
         </string-array>
     </carrier_config>
-    <carrier_config operator="SWISSCOM">
+    <carrier_config operator="FirstNet">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="config_oplus_sms_ims_support_bool" value="false" />
-        <boolean name="carrier_supports_ss_over_ut_bool" value="true" />
-        <string-array name="mccmnc" num="2">
-            <item value="22801" />
-            <item value="29501" />
+        <boolean name="carrier_vt_available_bool" value="true" />
+        <string-array name="mccmnc" num="5">
+            <item value="313100" />
+            <item value="313110" />
+            <item value="313120" />
+            <item value="313130" />
+            <item value="313140" />
         </string-array>
     </carrier_config>
 </carrier_config_list>