From 4c443e1d4eca7af3175076da067808a648801ad1 Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Thu, 26 Dec 2019 21:42:49 +0000
Subject: [PATCH] Revert submission 1182953-1576003954286-8455af5a

Reason for revert: Crashes telephony process when saving XML config from carrier apps (b/146727232)
Reverted Changes:
Ieaeec41f1: Whitelist telephony-common, ims-common.
I5588f7615: Add telephony-common, ims-common to telephony apex...
I81e922c0d: Add telephony-common, ims-common to telephony apex...

Change-Id: Ia64b73682fcc77db63e220867c66c4319c417582
Merged-In: Ia64b73682fcc77db63e220867c66c4319c417582
---
 target/product/base_system.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 352a0b520..ca408246a 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -97,6 +97,7 @@ PRODUCT_PACKAGES += \
     idmap2 \
     idmap2d \
     ime \
+    ims-common \
     incident \
     incidentd \
     incident_helper \
@@ -251,6 +252,7 @@ PRODUCT_PACKAGES += \
     task_profiles.json \
     tc \
     telecom \
+    telephony-common \
     tombstoned \
     traced \
     traced_probes \
@@ -336,8 +338,6 @@ PRODUCT_UPDATABLE_BOOT_JARS := \
     com.android.ipsec:ike \
     com.android.media:updatable-media \
     com.android.sdkext:framework-sdkext \
-    com.android.telephony:telephony-common \
-    com.android.telephony:ims-common \
     com.android.tethering:framework-tethering
 
 PRODUCT_COPY_FILES += \