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 | 9e0e8e9e9d4f83ba36c8c3e89ad549f9d643cf3d (patch) | |
| tree | 3c05df7cc85373bf650647c36e42003292c3122c | |
| parent | b71b5dfa316a661de3e2b01f3349cca34e0d06e8 (diff) | |
| parent | 4e221a4b852e0a4d42f1b6625057f0b9235b84fa (diff) | |
| download | android_packages_apps_CarrierConfig-9e0e8e9e9d4f83ba36c8c3e89ad549f9d643cf3d.tar.gz android_packages_apps_CarrierConfig-9e0e8e9e9d4f83ba36c8c3e89ad549f9d643cf3d.tar.bz2 android_packages_apps_CarrierConfig-9e0e8e9e9d4f83ba36c8c3e89ad549f9d643cf3d.zip | |
Merge "Fix bad merge conflict resolution in oc-dev by ag/2040324" into oc-dev
am: 4e221a4b85
Change-Id: If01276b9adbf547fa7f43c9eb9bb68b84eb7531e
| -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> |