Merge "Flag Yuan Chuan Telecom with no event pkg flag"
diff --git a/assets/carrier_config_carrierid_1581_au.xml b/assets/carrier_config_carrierid_1581_au.xml
index 0833acd..f2ec11a 100644
--- a/assets/carrier_config_carrierid_1581_au.xml
+++ b/assets/carrier_config_carrierid_1581_au.xml
@@ -3,4 +3,5 @@
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
<boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
<boolean name="allow_emergency_numbers_in_call_log_bool" value="true"/>
+ <long name="message_expiration_time_long" value="600000"/>
</carrier_config>
diff --git "a/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml" "b/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml"
index eac626c..c7d168b 100644
--- "a/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml"
+++ "b/assets/carrier_config_carrierid_1888_\345\217\260\347\201\243\345\244\247\345\223\245\345\244\247-Taiwan-Mobile-Telecom.xml"
@@ -2,4 +2,5 @@
<carrier_config>
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
<boolean name="hide_lte_plus_data_icon_bool" value="false"/>
+ <boolean name="support_ims_conference_event_package_bool" value="false"/>
</carrier_config>
diff --git a/assets/carrier_config_carrierid_1894_SoftBank.xml b/assets/carrier_config_carrierid_1894_SoftBank.xml
index 9c03f3e..953270b 100644
--- a/assets/carrier_config_carrierid_1894_SoftBank.xml
+++ b/assets/carrier_config_carrierid_1894_SoftBank.xml
@@ -16,6 +16,6 @@
<int name="maxImageWidth" value="2592"/>
<int name="volte_replacement_rat_int" value="3"/>
<int name="ims_dtmf_tone_delay_int" value="215"/>
- <long name="message_expiration_time_long" value="3600000"/>
+ <long name="message_expiration_time_long" value="600000"/>
<string name="default_vm_number_string">1416</string>
</carrier_config>
diff --git a/assets/carrier_config_carrierid_2109_Rakuten-Mobile.xml b/assets/carrier_config_carrierid_2109_Rakuten-Mobile.xml
index 6e9e160..7ac027b 100644
--- a/assets/carrier_config_carrierid_2109_Rakuten-Mobile.xml
+++ b/assets/carrier_config_carrierid_2109_Rakuten-Mobile.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<carrier_config>
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
+ <long name="message_expiration_time_long" value="600000"/>
</carrier_config>
diff --git a/assets/carrier_config_carrierid_2135_Coriolis.xml b/assets/carrier_config_carrierid_2135_Coriolis.xml
index 6e784bc..88d2aad 100644
--- a/assets/carrier_config_carrierid_2135_Coriolis.xml
+++ b/assets/carrier_config_carrierid_2135_Coriolis.xml
@@ -7,6 +7,9 @@
<int name="vvm_port_number_int" value="5499"/>
<string name="vvm_destination_number_string">223</string>
<string name="vvm_type_string">vvm_type_omtp</string>
+ <string-array name="carrier_vvm_package_name_string_array" num="1">
+ <item value="com.coriolis.visualvoicemailcoriolis"/>
+ </string-array>
<string name="sim_country_iso_override_string">fr</string>
<string-array name="non_roaming_operator_string_array" num="2">
<item value="20801"/>
diff --git a/assets/carrier_config_carrierid_27_SFR.xml b/assets/carrier_config_carrierid_27_SFR.xml
index 0aa9a52..b882bf4 100644
--- a/assets/carrier_config_carrierid_27_SFR.xml
+++ b/assets/carrier_config_carrierid_27_SFR.xml
@@ -2,6 +2,7 @@
<carrier_config>
<boolean name="carrier_supports_ss_over_ut_bool" value="true"/>
<boolean name="show_4g_for_lte_data_icon_bool" value="true"/>
+ <boolean name="support_ims_conference_event_package_bool" value="false"/>
<int name="maxImageHeight" value="1944"/>
<int name="maxMessageSize" value="614400"/>
<int name="maxImageWidth" value="2592"/>
