Merge "Fix bad merge conflict resolution in oc-dev by ag/2040324" into oc-dev am: 4e221a4b85
am: 9e0e8e9e9d
Change-Id: I0dd4b5047a279364925189511862611c2180b2f2
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index fb7696a..e5a92f9 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -131,6 +131,14 @@
<boolean name="is_ims_conference_size_enforced_bool" value="true"/>
<int name="ims_conference_size_limit_int" value="5" />
<boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false" />
+ <string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
+ <item value="*71" />
+ <item value="*72" />
+ </string-array>
<boolean name="disable_voice_barring_notification_bool" value="true" />
</carrier_config>
+ <!-- Tracfone Vzw shows empty string as SPN -->
+ <carrier_config gid1="BA01270000000000">
+ <boolean name="carrier_name_override_bool" value="true" />
+ </carrier_config>
</carrier_config_list>