summaryrefslogtreecommitdiffstats
path: root/assets
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2017-02-03 13:47:50 -0800
committerTyler Gunn <tgunn@google.com>2017-02-03 13:48:01 -0800
commitdffe00db84982540a965d86526d5d16066a6cf9e (patch)
tree4fa1e5a56b672a7acc0e40197182f1b45b263fbe /assets
parenta25d91afeaf160ca165c735a1b01ce4d5690b9f1 (diff)
parentbbf683a19108bfc9aa47052a5f60129e8dbbae9b (diff)
downloadandroid_packages_apps_CarrierConfig-dffe00db84982540a965d86526d5d16066a6cf9e.tar.gz
android_packages_apps_CarrierConfig-dffe00db84982540a965d86526d5d16066a6cf9e.tar.bz2
android_packages_apps_CarrierConfig-dffe00db84982540a965d86526d5d16066a6cf9e.zip
resolve merge conflicts of bbf683a to nyc-mr2-dev-plus-aosp
Test: Fix build. Change-Id: Ib22c9236a4cc83ddcd49f6f9faabcc4781cf9cdf
Diffstat (limited to 'assets')
-rw-r--r--assets/carrier_config_311480.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index f9074ef..eb5b784 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -45,7 +45,7 @@
<boolean name="video_calls_can_be_hd_audio" value="false" />
<boolean name="allow_add_call_during_video_call" value="false" />
<boolean name="carrier_promote_wfc_on_call_fail_bool" value="true" />
- <string-array name="ims_reasoninfo_mapping_string_array" num="9">
+ <string-array name="ims_reasoninfo_mapping_string_array" num="10">
<item value="332|simultaneous call limit has already been reached|1403" />
<item value="332|Forbidden: Simultaneous Call Limit Has Already Been Reached|1403" />
<item value="338|another device sent all devices busy response|1404" />
@@ -55,6 +55,7 @@
<item value="501|another device sent all devices busy response|1404" />
<item value="510|another device sent all devices busy response|1404" />
<item value="1014|call has been pulled by another device|1016" />
+ <item value="*|Call is dropped due to Wi-Fi signal is degraded|1407" />
</string-array>
<boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
<boolean name="mmsCloseConnection" value="true"/>