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

 * Overlays were deprecated awhile ago for these.

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

diff --git a/overlay/CarrierConfigResCommon/res/xml/vendor.xml b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
index 8d00cba..0ae4fb5 100644
--- a/overlay/CarrierConfigResCommon/res/xml/vendor.xml
+++ b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
@@ -45,6 +45,8 @@
         <boolean name="carrier_allow_transfer_ims_call_bool" value="true" />
         <long name="carrier_data_call_apn_retry_after_disconnect_long" value="100" />
         <string name="gps.nfw_proxy_apps">com.example.android.locationattribution</string>
+        <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/TelephonyResCommon/res/values/config.xml b/overlay/TelephonyResCommon/res/values/config.xml
index 23fb2b9..0750239 100644
--- a/overlay/TelephonyResCommon/res/values/config.xml
+++ b/overlay/TelephonyResCommon/res/values/config.xml
@@ -15,17 +15,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>
-
     <!-- 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). -->