Merge "IMS-VT: Enable emergency video calls based on mcc/mnc"
diff --git a/assets/carrier_config_23415.xml b/assets/carrier_config_23415.xml
index badfc31..24b7fd8 100644
--- a/assets/carrier_config_23415.xml
+++ b/assets/carrier_config_23415.xml
@@ -6,5 +6,10 @@
<string-array name="read_only_apn_types_string_array" num="1">
<item value="*" />
</string-array>
+ <string-array name="feature_access_codes_string_array" num="3">
+ <item value="153" />
+ <item value="132" />
+ <item value="45" />
+ </string-array>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_23430.xml b/assets/carrier_config_23430.xml
index 5345c97..2c24c59 100644
--- a/assets/carrier_config_23430.xml
+++ b/assets/carrier_config_23430.xml
@@ -12,6 +12,7 @@
<item value="23434" />
<item value="23486" />
</string-array>
+ <boolean name="display_voicemail_number_as_default_call_forwarding_number" value="true" />
</carrier_config>
<carrier_config gid1="28000000">
<boolean name="carrier_name_override_bool" value="true" />
diff --git a/assets/carrier_config_23433.xml b/assets/carrier_config_23433.xml
index 5345c97..2c24c59 100644
--- a/assets/carrier_config_23433.xml
+++ b/assets/carrier_config_23433.xml
@@ -12,6 +12,7 @@
<item value="23434" />
<item value="23486" />
</string-array>
+ <boolean name="display_voicemail_number_as_default_call_forwarding_number" value="true" />
</carrier_config>
<carrier_config gid1="28000000">
<boolean name="carrier_name_override_bool" value="true" />
diff --git a/assets/carrier_config_310120.xml b/assets/carrier_config_310120.xml
index e18d5c9..94e9780 100644
--- a/assets/carrier_config_310120.xml
+++ b/assets/carrier_config_310120.xml
@@ -29,5 +29,6 @@
<boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" />
<string name="carrier_eri_file_name_string">eri_310120.xml</string>
<boolean name="stk_disable_launch_browser_bool" value="true" />
+ <boolean name="config_telephony_use_own_number_for_voicemail_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311490.xml b/assets/carrier_config_311490.xml
index 16fe286..1c7600e 100644
--- a/assets/carrier_config_311490.xml
+++ b/assets/carrier_config_311490.xml
@@ -22,5 +22,6 @@
<boolean name="enableMultipartSMS" value="true" />
<boolean name="allow_non_emergency_calls_in_ecm_bool" value="false" />
<string name="carrier_eri_file_name_string">eri_311490.xml</string>
+ <boolean name="config_telephony_use_own_number_for_voicemail_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_311870.xml b/assets/carrier_config_311870.xml
index b5417e0..02a584b 100644
--- a/assets/carrier_config_311870.xml
+++ b/assets/carrier_config_311870.xml
@@ -19,5 +19,6 @@
<boolean name="enabledMMS" value="true" />
<boolean name="enableMultipartSMS" value="true" />
<string name="carrier_eri_file_name_string">eri_311870.xml</string>
+ <boolean name="config_telephony_use_own_number_for_voicemail_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_334050.xml b/assets/carrier_config_334050.xml
index 05b1dfd..b3ca0b6 100644
--- a/assets/carrier_config_334050.xml
+++ b/assets/carrier_config_334050.xml
@@ -2,5 +2,6 @@
<carrier_config_list>
<carrier_config>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+<boolean name="skip_cf_fail_to_disable_dialog_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_334090.xml b/assets/carrier_config_334090.xml
index 05b1dfd..b3ca0b6 100644
--- a/assets/carrier_config_334090.xml
+++ b/assets/carrier_config_334090.xml
@@ -2,5 +2,6 @@
<carrier_config_list>
<carrier_config>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
+<boolean name="skip_cf_fail_to_disable_dialog_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44010.xml b/assets/carrier_config_44010.xml
index 845b895..73b212e 100644
--- a/assets/carrier_config_44010.xml
+++ b/assets/carrier_config_44010.xml
@@ -9,10 +9,6 @@
<boolean name="always_show_emergency_alert_onoff_bool" value="true" />
<long name="message_expiration_time_long" value="3600000" />
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
-<string-array name="carrier_additional_cbs_channels_strings" num="2">
- <item value="0xA001-0xA002:type=other, emergency=true" />
- <item value="0xA004-0xA3FF:type=other, emergency=true" />
-</string-array>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 33fd90b..a84d4c9 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -12,12 +12,6 @@
<int name="volte_replacement_rat_int" value="3" />
<int name="ims_dtmf_tone_delay_int" value="215" />
<boolean name="always_show_emergency_alert_onoff_bool" value="true" />
- <string-array name="carrier_additional_cbs_channels_strings" num="4">
- <item value="0xA800:type=earthquake, emergency=true" />
- <item value="0xAFEE:type=tsunami, emergency=true" />
- <item value="0xAC00-0xAFED:type=other, emergency=true" />
- <item value="0xA802,0xA804:type=etws_default, emergency=true" />
- </string-array>
<string name="default_vm_number_string">1416</string>
<long name="message_expiration_time_long" value="3600000" />
<boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
diff --git a/assets/carrier_config_44050.xml b/assets/carrier_config_44050.xml
index 60bca17..3cbfc56 100644
--- a/assets/carrier_config_44050.xml
+++ b/assets/carrier_config_44050.xml
@@ -1,9 +1,6 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
<carrier_config>
- <string-array name="carrier_additional_cbs_channels_strings" num="1">
- <item value="0xA003:type=other, emergency=true" />
- </string-array>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44051.xml b/assets/carrier_config_44051.xml
index 60bca17..3cbfc56 100644
--- a/assets/carrier_config_44051.xml
+++ b/assets/carrier_config_44051.xml
@@ -1,9 +1,6 @@
<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
<carrier_config_list>
<carrier_config>
- <string-array name="carrier_additional_cbs_channels_strings" num="1">
- <item value="0xA003:type=other, emergency=true" />
- </string-array>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_44052.xml b/assets/carrier_config_44052.xml
deleted file mode 100644
index 4c70408..0000000
--- a/assets/carrier_config_44052.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='utf-8' standalone='yes' ?>
-<carrier_config_list>
- <carrier_config>
- <string-array name="carrier_additional_cbs_channels_strings" num="1">
- <item value="0xA003:type=other, emergency=true" />
- </string-array>
- </carrier_config>
-</carrier_config_list>
diff --git a/assets/carrier_config_50501.xml b/assets/carrier_config_50501.xml
index f0bc6b9..054a2a9 100644
--- a/assets/carrier_config_50501.xml
+++ b/assets/carrier_config_50501.xml
@@ -6,6 +6,11 @@
<int name="maxImageWidth" value="2592" />
<string name="default_vm_number_string">+61101</string>
<int name="carrier_default_wfc_ims_mode_int" value="1" />
- <boolean name="editable_tether_apn_bool" value="true" />
+ <string-array name="read_only_apn_types_string_array" num="0" />
+ <string-array name="carrier_metered_apn_types_strings" num="3">
+ <item value="default" />
+ <item value="dun" />
+ <item value="supl" />
+ </string-array>
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_50511.xml b/assets/carrier_config_50511.xml
index f0bc6b9..20698d2 100644
--- a/assets/carrier_config_50511.xml
+++ b/assets/carrier_config_50511.xml
@@ -6,6 +6,6 @@
<int name="maxImageWidth" value="2592" />
<string name="default_vm_number_string">+61101</string>
<int name="carrier_default_wfc_ims_mode_int" value="1" />
- <boolean name="editable_tether_apn_bool" value="true" />
+ <string-array name="read_only_apn_types_string_array" num="0" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_50571.xml b/assets/carrier_config_50571.xml
index f0bc6b9..20698d2 100644
--- a/assets/carrier_config_50571.xml
+++ b/assets/carrier_config_50571.xml
@@ -6,6 +6,6 @@
<int name="maxImageWidth" value="2592" />
<string name="default_vm_number_string">+61101</string>
<int name="carrier_default_wfc_ims_mode_int" value="1" />
- <boolean name="editable_tether_apn_bool" value="true" />
+ <string-array name="read_only_apn_types_string_array" num="0" />
</carrier_config>
</carrier_config_list>
diff --git a/assets/carrier_config_50572.xml b/assets/carrier_config_50572.xml
index a2f0d1f..8462648 100644
--- a/assets/carrier_config_50572.xml
+++ b/assets/carrier_config_50572.xml
@@ -6,7 +6,7 @@
<int name="maxImageWidth" value="2592" />
<string name="default_vm_number_string">+61101</string>
<int name="carrier_default_wfc_ims_mode_int" value="1" />
- <boolean name="editable_tether_apn_bool" value="true" />
+ <string-array name="read_only_apn_types_string_array" num="0" />
</carrier_config>
</carrier_config_list>