From 504b9a57b27ef191fe756ca60f54daeaeeb9fe9d Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 31 Dec 2020 00:46:08 +0000
Subject: sdm660-common: Use CodeAurora ImsService implementation for RCS

There is no evidence that Qualcomm devices running a rather recent IMS
stack need to include AOSP RCS packages. RCS already worked before this
change and continues to do so, but the main goal was to get rid of some
of the RCS related log spam, which was accomplished here.

Change-Id: I219546e29d288373877e9bcd194a60ef5e09f224
---
 overlay/packages/services/Telephony/res/values/config.xml | 2 +-
 sdm660.mk                                                 | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 0fb9172..c94316c 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -47,5 +47,5 @@
     <string name="config_ims_mmtel_package" translatable="false">org.codeaurora.ims</string>
 
     <!-- String indicating the package name of the device ImsService implementation for RCS. -->
-    <string name="config_ims_rcs_package" translatable="false">com.android.service.ims</string>
+    <string name="config_ims_rcs_package" translatable="false">org.codeaurora.ims</string>
 </resources>
diff --git a/sdm660.mk b/sdm660.mk
index a671bac..11bb63a 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -353,12 +353,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     libjson
 
-# RCS
-PRODUCT_PACKAGES += \
-    com.android.ims.rcsmanager \
-    PresencePolling \
-    RcsService
-
 # RenderScript HAL
 PRODUCT_PACKAGES += \
     android.hardware.renderscript@1.0-impl
-- 
cgit v1.2.3