From 91e1426d339a07a90b39cc7f547da231e9d5e8b1 Mon Sep 17 00:00:00 2001
From: Jack Yu <jackyu@google.com>
Date: Wed, 15 Apr 2020 13:53:17 -0700
Subject: [PATCH] Cell broadcast receiver should not be replaced

The default cell broadcast receiver is part
of the mainline module that should not be
replaced by any other package.

Fix: 154068864
Test: Manual
Change-Id: I96ad41b709006b88f4be6edf4f8d24c65611c2e1
---
 core/res/res/values/config.xml  | 7 +------
 core/res/res/values/symbols.xml | 1 -
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index fba237936f6e7..12c727c0ecdd8 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -246,7 +246,7 @@
          correctly use them when installed on your device.  Otherwise, keep this disabled
          so that applications can still use their own mechanisms. -->
     <bool name="config_enableAutoPowerModes">false</bool>
- 
+
     <!-- Whether (if true) this is a kind of device that can be moved around (eg. phone/laptop),
          or (if false) something for which movement is either not measurable or should not count
          toward power states (eg. tv/soundbar). -->
@@ -3574,11 +3574,6 @@
     <!-- Flag indicates that whether non-system apps can be installed on internal storage. -->
     <bool name="config_allow3rdPartyAppOnInternal">true</bool>
 
-    <!-- Package names of the default cell broadcast receivers -->
-    <string-array name="config_defaultCellBroadcastReceiverPkgs" translatable="false">
-        <item>com.android.cellbroadcastreceiver</item>
-    </string-array>
-
     <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
     <string name="config_icon_mask" translatable="false">"M50,0L92,0C96.42,0 100,4.58 100 8L100,92C100, 96.42 96.42 100 92 100L8 100C4.58, 100 0 96.42 0 92L0 8 C 0 4.42 4.42 0 8 0L50 0Z"</string>
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 01d4e8c562498..bc770890c960a 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3171,7 +3171,6 @@
   <java-symbol type="drawable" name="lockscreen_selected" />
 
   <java-symbol type="string" name="notification_header_divider_symbol_with_spaces" />
-  <java-symbol type="array" name="config_defaultCellBroadcastReceiverPkgs" />
 
   <java-symbol type="color" name="notification_primary_text_color_light" />
   <java-symbol type="color" name="notification_primary_text_color_dark" />