DO NOT MERGE: Merge Oreo MR1 into master
Exempt-From-Owner-Approval: Changes already landed internally
Change-Id: I55536dff049435187995f2d452b59f64bef5f721
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index a5745b4..ef18d8b 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -65,9 +65,10 @@
<item value="dun" />
<item value="supl" />
</string-array>
- <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+ <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
<item value="default" />
<item value="dun" />
+ <item value="mms" />
<item value="supl" />
</string-array>
<boolean name="disable_voice_barring_notification_bool" value="true" />
diff --git a/assets/carrier_config_302370.xml b/assets/carrier_config_302370.xml
index a36d549..398196f 100644
--- a/assets/carrier_config_302370.xml
+++ b/assets/carrier_config_302370.xml
@@ -7,6 +7,7 @@
<int name="maxSubjectLength" value="80"/>
<int name="maxMessageSize" value="1048576"/>
<int name="maxImageWidth" value="2592"/>
+ <boolean name="call_forwarding_map_non_number_to_voicemail_bool" value="true" />
<string-array name="read_only_apn_types_string_array" num="1">
<item value="*"/>
</string-array>
diff --git a/assets/carrier_config_302720.xml b/assets/carrier_config_302720.xml
index 3111e87..cb8e7ed 100644
--- a/assets/carrier_config_302720.xml
+++ b/assets/carrier_config_302720.xml
@@ -8,6 +8,7 @@
<int name="maxMessageSize" value="1048576" />
<int name="maxImageWidth" value="2592" />
<boolean name="voicemail_notification_persistent_bool" value="true" />
+ <boolean name="call_forwarding_map_non_number_to_voicemail_bool" value="true" />
<string-array name="read_only_apn_types_string_array" num="1">
<item value="*" />
</string-array>
@@ -21,4 +22,4 @@
<boolean name="carrier_name_override_bool" value="true" />
<string name="carrier_name_string">Rogers</string>
</carrier_config>
-</carrier_config_list>
+</carrier_config_list>
\ No newline at end of file
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index 81153ce..746cb45 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -79,9 +79,10 @@
<item value="dun" />
<item value="supl" />
</string-array>
- <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+ <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
<item value="default" />
<item value="dun" />
+ <item value="mms" />
<item value="supl" />
</string-array>
<boolean name="disable_voice_barring_notification_bool" value="true" />
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 77c72d6..e6c1966 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -123,9 +123,10 @@
<item value="dun" />
<item value="supl" />
</string-array>
- <string-array name="carrier_metered_roaming_apn_types_strings" num="3">
+ <string-array name="carrier_metered_roaming_apn_types_strings" num="4">
<item value="default" />
<item value="dun" />
+ <item value="mms" />
<item value="supl" />
</string-array>
<boolean name="is_ims_conference_size_enforced_bool" value="true"/>