From 2790468a889d147d1344f16aaef542fe2919c358 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Fri, 10 Jun 2016 14:57:27 -0700
Subject: Enabled carrier logic for Verizon.

Bug: 29275420
Change-Id: Ie7f562257a48c5af737b7072e73acb963fba9b6c
---
 assets/carrier_config_311480.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 5077309..b2cdf3f 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -33,5 +33,7 @@
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
         <int name="carrier_default_wfc_ims_mode_int" value="1"/>
+        <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
+        <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
     </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3


From 550ea646af963f7c343baf317302a8e74c8a31f1 Mon Sep 17 00:00:00 2001
From: pkanwar <pkanwar@google.com>
Date: Tue, 14 Jun 2016 09:21:04 -0700
Subject: Make the WFC prefence non-editable for Verizon.

b/28989849: The default WiFi calling preference for Verizon should be
cellular preferred per Carrier Requirements.

Change-Id: Ief9c01e2fee918942580296c2fa3159ce2a7f8a3
---
 assets/carrier_config_20404.xml  | 1 +
 assets/carrier_config_310004.xml | 1 +
 assets/carrier_config_311480.xml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index 2d8bbbf..d58cf8b 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -10,5 +10,6 @@
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
         <int name="carrier_default_wfc_ims_mode_int" value="1"/>
+        <boolean name="editable_wfc_mode_bool" value="false"/>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index abbc869..f89727e 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -28,5 +28,6 @@
         <boolean name="broadcast_emergency_call_state_changes_bool" value="true" />
         <string name="carrier_eri_file_name_string">eri_311480.xml</string>
         <int name="carrier_default_wfc_ims_mode_int" value="1"/>
+        <boolean name="editable_wfc_mode_bool" value="false"/>
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index b2cdf3f..45b755f 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -35,5 +35,6 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1"/>
         <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
         <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
+        <boolean name="editable_wfc_mode_bool" value="false"/>
     </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3


From 123808102f9036a71198a96ea6cf33cfa3b5ad69 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Wed, 22 Jun 2016 16:36:30 -0700
Subject: Disallow merge of wifi calls when vowifi off for VZW.

Bug: 29059073
Change-Id: I167f21f2d08c814da5cc04a5cf956dd4c826c849
---
 assets/carrier_config_311480.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 45b755f..db242ea 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -36,5 +36,6 @@
         <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
         <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
         <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false" />
     </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3


From d8c6771ac2b30de0b586b08134236f5daa9cb9ae Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Tue, 12 Jul 2016 14:28:51 -0700
Subject: Fix "num" in the carrier config to be 5 vs 4.

Change-Id: I95035c8dc113e0a984fa57d3c9aebe6117481ec2
---
 assets/carrier_config_311480.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index c22b1b1..76ae313 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -39,7 +39,7 @@
         <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" 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="4">
+        <string-array name="ims_reasoninfo_mapping_string_array" num="5">
             <item value="332|simultaneous call limit has already been reached|1403" />
             <item value="501|call completion elsewhere|1014" />
             <item value="501|call has been pulled by another device|1016" />
-- 
cgit v1.2.3


From f9136b9dece0c68751295ce192ad701a15382d77 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Mon, 8 Aug 2016 14:43:17 -0700
Subject: Use correct SPN format for VZW WFC.

Bug: 30474919
Change-Id: I0f0dbda86fb441d2b8c10a2934650b9ecec63e19
---
 assets/carrier_config_20404.xml  | 1 +
 assets/carrier_config_310004.xml | 1 +
 assets/carrier_config_311480.xml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml
index d016325..f05fe16 100644
--- a/assets/carrier_config_20404.xml
+++ b/assets/carrier_config_20404.xml
@@ -12,5 +12,6 @@
         <int name="carrier_default_wfc_ims_mode_int" value="1"/>
         <boolean name="editable_wfc_mode_bool" value="false"/>
         <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
+        <int name="wfc_spn_format_idx_int" value="1" />
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_310004.xml b/assets/carrier_config_310004.xml
index f2f86f7..57b60ec 100644
--- a/assets/carrier_config_310004.xml
+++ b/assets/carrier_config_310004.xml
@@ -31,5 +31,6 @@
         <boolean name="editable_wfc_mode_bool" value="false"/>
         <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
         <boolean name="mmsCloseConnection" value="true"/>
+        <int name="wfc_spn_format_idx_int" value="1" />
     </carrier_config>
 </carrier_config_list>
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 2579644..1694aa8 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -54,5 +54,6 @@
         <boolean name="disable_severe_when_extreme_disabled_bool" value="false" />
         <boolean name="mmsCloseConnection" value="true"/>
         <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true" />
+        <int name="wfc_spn_format_idx_int" value="1" />
     </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3