diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2017-06-08 11:02:45 -0700 |
|---|---|---|
| committer | Sanket Padawe <sanketpadawe@google.com> | 2017-06-08 18:09:03 +0000 |
| commit | e10949f478098374ac5d4c635e046e10abd37c2a (patch) | |
| tree | 6f797c302548030dd644277858255a0f748402af | |
| parent | 344673420166c21b4812b691ffe40fcb5698ff8f (diff) | |
| download | android_packages_apps_CarrierConfig-e10949f478098374ac5d4c635e046e10abd37c2a.tar.gz android_packages_apps_CarrierConfig-e10949f478098374ac5d4c635e046e10abd37c2a.tar.bz2 android_packages_apps_CarrierConfig-e10949f478098374ac5d4c635e046e10abd37c2a.zip | |
Fix bad merge conflict resolution in oc-dev by ag/2040324
Earlier, it was added by ag/1730167
Fix: 62361287
Test: manual
Change-Id: I5d15f0778f9d41a87121a39492f19299fde3eac9
| -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> |