From 5e7f190a65a44454bf74e0a6fd1936cdfa37c563 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Fri, 1 May 2020 15:29:46 -0700
Subject: [PATCH] Remove hard-coding cellbroadcastreceiver package name.

Test: manual
Bug: 154436403
Change-Id: Id634a88060c63d57316cb8cdb923966a8409db78
Merged-in: Id634a88060c63d57316cb8cdb923966a8409db78
---
 res/values/strings.xml                                       | 3 +++
 res/xml/app_and_notification.xml                             | 2 +-
 .../notification/EmergencyBroadcastPreferenceController.java | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 18673e490c5..ae9b37dda9f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -7310,6 +7310,9 @@
     <!-- Summary of multimedia messaging service settings.  [CHAR LIMIT=100] -->
     <string name="mms_message_summary">Send &amp; receive when mobile data is off</string>
 
+    <!-- Cell broacast receiver package name [DO NOT TRANSLATE] -->
+    <string name="cell_broadcast_receiver_package">com.android.cellbroadcastreceiver</string>
+
     <!-- Title of a preference for whether to allow data during calls that is shown when mobile
          data is turned off. This is needed for some multi-SIM scenarios, because the SIM that is
          default for data might not be available during a phone call. [CHAR LIMIT=60] -->
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index f75bd8629ae..b49918024a3 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -82,7 +82,7 @@
         settings:useAdminDisabledSummary="true">
         <intent
             android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.cellbroadcastreceiver"
+            android:targetPackage="@string/cell_broadcast_receiver_package"
             android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
     </com.android.settingslib.RestrictedPreference>
 
diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
index 7add167ab8e..de7e7801ac2 100644
--- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
@@ -24,6 +24,7 @@ import android.os.UserManager;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 
+import com.android.internal.telephony.CellBroadcastUtils;
 import com.android.settings.accounts.AccountRestrictionHelper;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedPreference;
@@ -88,7 +89,9 @@ public class EmergencyBroadcastPreferenceController extends AbstractPreferenceCo
                 com.android.internal.R.bool.config_cellBroadcastAppLinks);
         if (enabled) {
             try {
-                if (mPm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
+                String packageName = CellBroadcastUtils
+                        .getDefaultCellBroadcastReceiverPackageName(mContext);
+                if (packageName == null || mPm.getApplicationEnabledSetting(packageName)
                         == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
                     enabled = false;  // CMAS app disabled
                 }