Merge commit '77d1d54f73e3fd31be64263e20f175733c1089d6' into HEAD
Change-Id: Ib9dbbcd06ea75f30a6da03bb5a2992e173c80825
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>