From a0f1f2519fffe1072b0a11b40272d3dc1df2a075 Mon Sep 17 00:00:00 2001
From: Alexander Koskovich <akoskovich@pm.me>
Date: Wed, 8 Sep 2021 01:10:46 -0700
Subject: [PATCH] veux: overlay: Use CarrierConfig DTMF & CSP booleans

 * Overlays were deprecated awhile ago for these.

Change-Id: I51b70aa15f128186063ce52446cb67715a957185
---
 overlay/CarrierConfigOverlayCOMMON/res/xml/vendor.xml |  2 ++
 overlay/TelephonyOverlayCOMMON/res/values/config.xml  | 11 -----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/overlay/CarrierConfigOverlayCOMMON/res/xml/vendor.xml b/overlay/CarrierConfigOverlayCOMMON/res/xml/vendor.xml
index 5916812..bad3ccc 100644
--- a/overlay/CarrierConfigOverlayCOMMON/res/xml/vendor.xml
+++ b/overlay/CarrierConfigOverlayCOMMON/res/xml/vendor.xml
@@ -43,6 +43,8 @@
         <string name="gps.nfw_proxy_apps">com.example.android.locationattribution</string>
         <boolean name="carrier_cross_sim_ims_available_bool" value="true" />
         <boolean name="carrier_b2c_enriched_calling_supported_bool" value="false" />
+        <boolean name="dtmf_type_enabled_bool" value="true" />
+        <boolean name="csp_enabled_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="001" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
diff --git a/overlay/TelephonyOverlayCOMMON/res/values/config.xml b/overlay/TelephonyOverlayCOMMON/res/values/config.xml
index ce786d9..ddd0812 100644
--- a/overlay/TelephonyOverlayCOMMON/res/values/config.xml
+++ b/overlay/TelephonyOverlayCOMMON/res/values/config.xml
@@ -8,17 +8,6 @@
     <!-- Flag indicating whether the device supports RTT (real-time text) -->
     <bool name="config_support_rtt">true</bool>
 
-    <!-- If this is true, the SIM card (through Customer Service Profile EF file) will be
-         able to prevent manual operator selection. If false, this SIM setting will be
-         ignored and manual operator selection will always be available. See
-         CPHS4_2.WW6, CPHS B.4.7.1 for more information -->
-    <!-- DEPRECATED: Use CarrierConfigManager#KEY_CSP_ENABLED_BOOL -->
-    <bool name="csp_enabled">true</bool>
-
-    <!-- Flag indicating if dtmf tone type is enabled -->
-    <!-- DEPRECATED: Use CarrierConfigManager#KEY_DTMF_TYPE_ENABLED_BOOL -->
-    <bool name="dtmf_type_enabled">true</bool>
-
     <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
     <string name="config_ims_mmtel_package" translatable="false">org.codeaurora.ims</string>