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

 * Overlays were deprecated awhile ago for these.

Change-Id: I51b70aa15f128186063ce52446cb67715a957185
---
 overlay/CarrierConfigResCommon/res/xml/vendor.xml | 4 +++-
 overlay/TelephonyResCommon/res/values/config.xml  | 6 ------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/overlay/CarrierConfigResCommon/res/xml/vendor.xml b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
index 7ab9872..3232b1d 100644
--- a/overlay/CarrierConfigResCommon/res/xml/vendor.xml
+++ b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
@@ -45,6 +45,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" />
@@ -2556,4 +2558,4 @@
     <carrier_config mcc="999">
         <boolean name="is_private_network" value="true" />
     </carrier_config>
-</carrier_config_list>
\ No newline at end of file
+</carrier_config_list>
diff --git a/overlay/TelephonyResCommon/res/values/config.xml b/overlay/TelephonyResCommon/res/values/config.xml
index dbf4313..39cc546 100644
--- a/overlay/TelephonyResCommon/res/values/config.xml
+++ b/overlay/TelephonyResCommon/res/values/config.xml
@@ -9,17 +9,11 @@
          successfully placing the OTA call -->
     <integer name="OtaShowListeningScreen">1</integer>
 
-    <!-- DEPRECATED: Use CarrierConfigManager#KEY_DTMF_TYPE_ENABLED_BOOL -->
-    <bool name="dtmf_type_enabled">true</bool>
-
     <!-- Determine whether calls to mute the microphone in PhoneUtils
          are routed through the android.media.AudioManager class (true) or through
          the com.android.internal.telephony.Phone interface (false). -->
     <bool name="send_mic_mute_to_AudioManager">true</bool>
 
-    <!-- DEPRECATED: Use CarrierConfigManager#KEY_CSP_ENABLED_BOOL -->
-    <bool name="csp_enabled">true</bool>
-
     <!-- Flag indicating whether the device supports RTT (real-time text) -->
     <bool name="config_support_rtt">true</bool>