diff options
author | Sanket Padawe <sanketpadawe@google.com> | 2017-06-09 00:36:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-06-09 00:36:59 +0000 |
commit | 807971d2185112516d5772e8a213c9893ced61e4 (patch) | |
tree | 305dc29657af5e5eff948769a1a12ec01832cc7b | |
parent | 4e272b8206eb7d704a840e11c0e7bb6724cf5206 (diff) | |
parent | 4e221a4b852e0a4d42f1b6625057f0b9235b84fa (diff) | |
download | android_packages_apps_CarrierConfig-807971d2185112516d5772e8a213c9893ced61e4.tar.gz android_packages_apps_CarrierConfig-807971d2185112516d5772e8a213c9893ced61e4.tar.bz2 android_packages_apps_CarrierConfig-807971d2185112516d5772e8a213c9893ced61e4.zip |
Merge "Fix bad merge conflict resolution in oc-dev by ag/2040324" into oc-dev
am: 4e221a4b85
Change-Id: I1965c73b010c7c8bb108347fe40919ab8ee2e854
-rw-r--r-- | assets/carrier_config_311480.xml | 8 |
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> |