From ca6b06a48f87cbf6f1e03171011da814fbf70a14 Mon Sep 17 00:00:00 2001
From: joonhunshin <joonhunshin@google.com>
Date: Fri, 11 Aug 2023 01:24:59 +0000
Subject: [PATCH] Removing TestRcsApp userdebug application from the system
 image.

RCS has a low priority and will not be used in the future, remove it from the system image.

Bug: 295403727
Test: Make sure the TestRcsApp is removed from the system image.

Change-Id: I5bff88e66f4ecf43236dab8c3dbbd836cec9f91b
---
 device.mk                                            |  4 +---
 preinstalled-packages-product-gs101-device-debug.xml | 10 ----------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/device.mk b/device.mk
index 9e5f0071..013470d9 100644
--- a/device.mk
+++ b/device.mk
@@ -889,10 +889,8 @@ PRODUCT_PACKAGES += ShannonIms
 
 $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-iwlan/device-vendor.mk)
 
-#RCS Test Messaging App
 PRODUCT_PACKAGES_DEBUG += \
-	preinstalled-packages-product-gs101-device-debug.xml \
-	TestRcsApp
+	preinstalled-packages-product-gs101-device-debug.xml
 
 PRODUCT_PACKAGES += ShannonRcs
 endif
diff --git a/preinstalled-packages-product-gs101-device-debug.xml b/preinstalled-packages-product-gs101-device-debug.xml
index ce25deb3..88204bca 100644
--- a/preinstalled-packages-product-gs101-device-debug.xml
+++ b/preinstalled-packages-product-gs101-device-debug.xml
@@ -24,14 +24,4 @@
         <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
         <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
     </install-in-user-type>
-
-    <!-- RCS - Rich Communication Services (TestRcsApp)
-    TODO(b/259401601): Check if this should be preinstalled for SYSTEM user -->
-    <install-in-user-type package="com.google.android.sample.rcsclient">
-        <install-in user-type="SYSTEM" />
-        <install-in user-type="FULL" />
-        <install-in user-type="PROFILE" />
-        <do-not-install-in user-type="android.os.usertype.profile.CLONE" />
-        <do-not-install-in user-type="android.os.usertype.profile.PRIVATE" />
-    </install-in-user-type>
 </config>