summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanket Padawe <sanketpadawe@google.com>2017-06-09 00:41:29 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-09 00:41:29 +0000
commit03dd3f773e3f3d2b2e407f5a1170301fd2e18fc9 (patch)
tree305dc29657af5e5eff948769a1a12ec01832cc7b
parentc4255b04f6e04f923df5e0a52c39d7db2ff33b2e (diff)
parent8fc94b0b28469f49a1d0fa3b27b6ad95e576f0e8 (diff)
downloadandroid_packages_apps_CarrierConfig-03dd3f773e3f3d2b2e407f5a1170301fd2e18fc9.tar.gz
android_packages_apps_CarrierConfig-03dd3f773e3f3d2b2e407f5a1170301fd2e18fc9.tar.bz2
android_packages_apps_CarrierConfig-03dd3f773e3f3d2b2e407f5a1170301fd2e18fc9.zip
Merge "Fix bad merge conflict resolution in oc-dev by ag/2040324" into oc-dev am: 4e221a4b85 am: 807971d218
am: 8fc94b0b28 Change-Id: If8a53950ac7c1323d818243dfdedf67d416c9f78
-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>