From f75e119593403f2cde9ddf7b6e6ac7ccd0bcd83d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <jbeckmeyer@cedarville.edu>
Date: Fri, 15 Mar 2024 10:19:04 -0400
Subject: [PATCH] overlay: several Dialer VVM config fixes

* Change `vvm_type_omtp_*` to `vvm_type_omtp` (As before, Google Dialer
  uses these types, but our Dialer does not)
* enable VVM for all "Bouygues Telecom Business-Distribution" MVNOs
  instead of just one MVNO (NRJ). This has been validated with a device
  using the "Auchan Telecom" MVNO.

Change-Id: Iecada64dc758952aa9c8f8e0efcebc719d16d352
---
 .../java/com/android/voicemail/impl/res/xml/vvm_config.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 78cd5f54..917cee8a 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
@@ -22,12 +22,12 @@
     </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
-            <item value="20826?gid1=NRJ1" />
+            <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_1_3</string>
+        <string name="vvm_type_string">vvm_type_omtp</string>
     </pbundle_as_map>
     <pbundle_as_map>
         <string-array name="mccmnc">
@@ -440,7 +440,7 @@
         <int name="vvm_port_number_int" value="0" />
         <string name="vvm_destination_number_string">9966</string>
         <int name="vvm_application_port_number_int" value="5499" />
-        <string name="vvm_type_string">vvm_type_omtp_1_2</string>
+        <string name="vvm_type_string">vvm_type_omtp</string>
         <boolean name="vvm_cellular_data_required_bool" value="true" />
         <string-array name="carrier_vvm_package_name_string_array">
             <item value="com.cellcom.cellcomvisualvoicemail" />