summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-09 00:34:21 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-09 00:34:22 +0000
commit4e221a4b852e0a4d42f1b6625057f0b9235b84fa (patch)
tree3c05df7cc85373bf650647c36e42003292c3122c
parent99e5666d2a27ea85395f4f24f6a5f5c133ed1f32 (diff)
parente10949f478098374ac5d4c635e046e10abd37c2a (diff)
downloadandroid_packages_apps_CarrierConfig-4e221a4b852e0a4d42f1b6625057f0b9235b84fa.tar.gz
android_packages_apps_CarrierConfig-4e221a4b852e0a4d42f1b6625057f0b9235b84fa.tar.bz2
android_packages_apps_CarrierConfig-4e221a4b852e0a4d42f1b6625057f0b9235b84fa.zip
Merge "Fix bad merge conflict resolution in oc-dev by ag/2040324" into oc-dev
-rw-r--r--assets/carrier_config_311480.xml8
1 files changed, 8 insertions, 0 deletions
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>