From f9835e419717a66dfc30b4a16505e8ab8d323f1d Mon Sep 17 00:00:00 2001
From: armdebug <100161001+armdebug@users.noreply.github.com>
Date: Thu, 1 Feb 2024 15:41:42 +0000
Subject: [PATCH] system: overlay: Remove obsolete CellBroadcastReceiver
 overlays

W idmap2d : failed to parse idmap header of '/data/resource-cache/product@overlay@CellBroadcastReceiverResCommon_Sys.apk@idmap'
W idmap2d : failed to find resource 'bool/show_brazil_settings'
W idmap2d : failed to find resource 'bool/show_cmas_settings'
W idmap2d : failed to find resource 'bool/show_etws_settings'

[1]: https://git.codelinaro.org/clo/la/platform/packages/apps/CellBroadcastReceiver/-/commit/8c8a0f6cb932e7f6f92df20d2b4f88c0f2c97b18
[2]: https://git.codelinaro.org/clo/la/platform/packages/apps/CellBroadcastReceiver/-/commit/cd2acb4d2824d8c4e270432fc02f7d790c38d17d
[3]: https://git.codelinaro.org/clo/la/platform/packages/apps/CellBroadcastReceiver/-/commit/107da0f3514f2aacccdced7a0a31d5c90411449e

Change-Id: Ic08d87724e7943fc20066da019ddca4e44da44ab
---
 .../overlay/CellBroadcastReceiver/Android.bp  |  4 ---
 .../CellBroadcastReceiver/AndroidManifest.xml |  9 ------
 .../res/values/config.xml                     | 29 -------------------
 system/overlay/qti-overlay.mk                 |  1 -
 4 files changed, 43 deletions(-)
 delete mode 100644 system/overlay/CellBroadcastReceiver/Android.bp
 delete mode 100755 system/overlay/CellBroadcastReceiver/AndroidManifest.xml
 delete mode 100644 system/overlay/CellBroadcastReceiver/res/values/config.xml

diff --git a/system/overlay/CellBroadcastReceiver/Android.bp b/system/overlay/CellBroadcastReceiver/Android.bp
deleted file mode 100644
index bb0e0ce0..00000000
--- a/system/overlay/CellBroadcastReceiver/Android.bp
+++ /dev/null
@@ -1,4 +0,0 @@
-runtime_resource_overlay {
-    name: "CellBroadcastReceiverResCommon_Sys",
-    product_specific: true,
-}
diff --git a/system/overlay/CellBroadcastReceiver/AndroidManifest.xml b/system/overlay/CellBroadcastReceiver/AndroidManifest.xml
deleted file mode 100755
index 24c7dbb0..00000000
--- a/system/overlay/CellBroadcastReceiver/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.cellbroadcastreceiver.overlay.common">
-
-    <overlay
-        android:isStatic="true"
-        android:priority="500"
-        android:targetPackage="com.android.cellbroadcastreceiver" />
-</manifest>
diff --git a/system/overlay/CellBroadcastReceiver/res/values/config.xml b/system/overlay/CellBroadcastReceiver/res/values/config.xml
deleted file mode 100644
index ef70652f..00000000
--- a/system/overlay/CellBroadcastReceiver/res/values/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Copyright (c) 2012, The Linux Foundation. All rights reserved.
-
-    Not a Contribution, Apache license notifications and license are retained
-    for attribution purposes only.
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Whether to enable ETWS settings (Japan) -->
-    <bool name="show_etws_settings">true</bool>
-    <!-- Whether to enable CMAS settings (United States) -->
-    <bool name="show_cmas_settings">true</bool>
-    <!-- Whether to enable channel 50 settings (Brazil) -->
-    <bool name="show_brazil_settings">true</bool>
-    <!-- Whether to enable channel 50 and 60 settings (India) -->
-    <!--bool name="show_india_settings">true</bool-->
-</resources>
diff --git a/system/overlay/qti-overlay.mk b/system/overlay/qti-overlay.mk
index 8b2069c9..1e807ef9 100644
--- a/system/overlay/qti-overlay.mk
+++ b/system/overlay/qti-overlay.mk
@@ -18,7 +18,6 @@ PRODUCT_SOONG_NAMESPACES += \
 # Overlays
 PRODUCT_PACKAGES += \
     CarrierConfigResCommon_Sys \
-    CellBroadcastReceiverResCommon_Sys \
     FrameworksResCommon_Sys \
     SettingsResCommon_Sys \
     SystemUIResCommon_Sys \