From 53526993b6fd8cb999f6ed2938142e89513c17c7 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 31 Dec 2020 00:46:08 +0000
Subject: [PATCH] msm8953-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
---
 msm8953.mk                                                | 5 -----
 overlay/packages/services/Telephony/res/values/config.xml | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/msm8953.mk b/msm8953.mk
index a614d6b..f77f1bf 100644
--- a/msm8953.mk
+++ b/msm8953.mk
@@ -300,11 +300,6 @@ PRODUCT_PACKAGES += \
     librmnetctl \
     libprotobuf-cpp-full
 
-# RCS
-PRODUCT_PACKAGES += \
-    com.android.ims.rcsmanager \
-    PresencePolling \
-    RcsService
 
 # Qualcomm
 PRODUCT_COPY_FILES += \
diff --git a/overlay/packages/services/Telephony/res/values/config.xml b/overlay/packages/services/Telephony/res/values/config.xml
index 0f08781..4955059 100644
--- a/overlay/packages/services/Telephony/res/values/config.xml
+++ b/overlay/packages/services/Telephony/res/values/config.xml
@@ -21,5 +21,5 @@
     <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>
+    <string name="config_ims_rcs_package" translatable="false">org.codeaurora.ims</string>
 </resources>