From 1a7e51cd2f237eb9882c921636c32ce16eab0f3a Mon Sep 17 00:00:00 2001
From: Brad Ebinger <breadley@google.com>
Date: Thu, 5 Dec 2019 11:37:45 -0800
Subject: [PATCH] sdm660-common: Remove old configuration and use new config
 for MMTEL/RCS

Remove the old config_ims_package device config and configure the
new MMTEL and RCS configurations in Telephony instead. Also,
configure the RcsService to be the default RCS service.

Bug: 111305845
Test: make checkbuild
Change-Id: I0d709b8248f1c40f0a5b50ec799396706eeadd65
Signed-off-by: Manish4586 <manish.n.manish45@gmail.com>
---
 overlay/frameworks/base/core/res/res/values/config.xml    | 6 ------
 overlay/packages/services/Telephony/res/values/config.xml | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index bd840ea7..5366527a 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -839,12 +839,6 @@
         provisioning, availability etc -->
    <bool name="config_carrier_wfc_ims_available">true</bool>
 
-   <!-- ImsService package name to bind to by default, if config_dynamic_bind_ims is true -->
-   <string name="config_ims_package">org.codeaurora.ims</string>
-
-   <!-- Flag specifying whether or not IMS will use the ImsResolver dynamically -->
-   <bool name="config_dynamic_bind_ims">true</bool>
-
     <!-- Is the battery LED intrusive? Used to decide if there should be a disable option -->
     <bool name="config_intrusiveBatteryLed">true</bool>
 
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 8523d216..f28bb958 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -25,4 +25,10 @@
 <resources>
     <!-- Flag indicating if hac is enabled -->
     <bool name="hac_enabled">true</bool>
+
+    <!-- String indicating the package name of the device ImsService implementation for MMTEL. -->
+    <string name="config_ims_mmtel_package">org.codeaurora.ims</string>
+
+    <!-- String indicating the package name of the device ImsService implementation for RCS. -->
+    <string name="config_ims_rcs_package">com.android.service.ims</string>
 </resources>