From 5e0e5c9118085f41f9c5f1eb284b9db6bc7ef925 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <jbeckmeyer@cedarville.edu>
Date: Mon, 22 Apr 2024 12:25:55 -0400
Subject: [PATCH] overlay: Update Dialer VVM config

- Selectively merge changes from com.google.android.dialer version
  127.0.620688474-downloadable
- Remove obvious attempts to limit user freedom by forcing users to use
  carrier VVM app for Cellcom and Metro by T-Mobile.

Change-Id: I72bc29e4db5382f02508669c1cdc65812f1fbb13
---
 .../voicemail/impl/res/xml/vvm_config.xml     | 52 ++++++++-----------
 1 file changed, 23 insertions(+), 29 deletions(-)

diff --git a/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml b/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
index 917cee8a..56e73c5c 100644
--- a/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
+++ b/overlay/common/packages/apps/Dialer/java/com/android/voicemail/impl/res/xml/vvm_config.xml
@@ -24,7 +24,6 @@
         <string-array name="mccmnc">
             <item value="20826" />
         </string-array>
-        <string name="feature_flag_name">vvm_carrier_flag_el_telecom</string>
         <int name="vvm_port_number_int" value="5499" />
         <string name="vvm_destination_number_string">8860</string>
         <string name="vvm_type_string">vvm_type_omtp</string>
@@ -435,7 +434,7 @@
         <string name="feature_flag_name">vvm_carrier_cellcom</string>
         <string-array name="mccmnc">
             <item value="311480?gid1=BA00040000000000" />
-            <item value="311850?gid1=BA00040000000000" />
+            <item value="311850" />
         </string-array>
         <int name="vvm_port_number_int" value="0" />
         <string name="vvm_destination_number_string">9966</string>
@@ -447,33 +446,6 @@
         </string-array>
         <boolean name="vvm_legacy_mode_enabled_bool" value="true" />
     </pbundle_as_map>
-    <pbundle_as_map>
-        <string name="feature_flag_name">vvm_carrier_cellcom_disabled</string>
-        <string-array name="mccmnc">
-            <item value="311480?gid1=BA00040000000000" />
-            <item value="311850" />
-        </string-array>
-        <string name="vvm_type_string">vvm_type_disabled</string>
-    </pbundle_as_map>
-    <pbundle_as_map>
-        <string name="feature_flag_name">disable_vvm_carrier_flag_metro_pcs</string>
-        <string-array name="mccmnc">
-            <item value="310240?gid1=6D38" />
-            <item value="310260?gid1=6D38" />
-            <item value="00101?gid1=6D38" />
-            <item value="310160?gid1=6D38" />
-            <item value="310200?gid1=6D38" />
-            <item value="310210?gid1=6D38" />
-            <item value="310220?gid1=6D38" />
-            <item value="310230?gid1=6D38" />
-            <item value="310250?gid1=6D38" />
-            <item value="310270?gid1=6D38" />
-            <item value="310490?gid1=6D38" />
-            <item value="310660?gid1=6D38" />
-            <item value="310800?gid1=6D38" />
-        </string-array>
-        <string name="vvm_type_string">vvm_type_disabled</string>
-    </pbundle_as_map>
     <pbundle_as_map>
         <string name="feature_flag_name">enable_vvm_carrier_flag_metro_pcs</string>
         <string-array name="mccmnc">
@@ -502,4 +474,26 @@
         <boolean name="vvm_ignore_transcription" value="true" />
         <boolean name="vvm_change_greeting_enabled_bool" value="true" />
     </pbundle_as_map>
+    <pbundle_as_map>
+        <string name="feature_flag_name">enable_vvm_carrier_flag_claro_pr</string>
+        <string-array name="mccmnc">
+            <item value="330110" />
+            <item value="33011" />
+        </string-array>
+        <int name="vvm_port_number_int" value="148" />
+        <string name="vvm_destination_number_string">8860</string>
+        <string name="vvm_type_string">vvm_type_omtp</string>
+    </pbundle_as_map>
+    <pbundle_as_map>
+        <string name="feature_flag_name">enable_vvm_carrier_sunrise</string>
+        <string-array name="mccmnc">
+            <item value="22802" />
+        </string-array>
+        <int name="vvm_port_number_int" value="5499" />
+        <int name="vvm_ssl_port_number_int" value="993" />
+        <string name="vvm_destination_number_string">3030</string>
+        <string name="vvm_type_string">vvm_type_omtp</string>
+        <boolean name="vvm_cellular_data_required_bool" value="false" />
+        <boolean name="vvm_ssl_enabled_bool" value="true" />
+    </pbundle_as_map>
 </list>