From 4c0e2a4957f90d86b0e80a6b41bf59df4443e0b2 Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Wed, 4 Dec 2019 12:09:56 -0800
Subject: [PATCH] Add CBR and shell to telephony permission

Bug: 135956699
Test: send test broadcast, atest CellBroadcastIntentsTest
Change-Id: I5e7b28bb8f347f61b781b017e72194a7cf0d7037
---
 core/res/res/values/config.xml     | 3 ++-
 packages/Shell/AndroidManifest.xml | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index fc9fa8595c5bf..ffed16e4d7852 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3523,8 +3523,9 @@
          protection level. Note, framework by default support multiple telephony apps, each package
          name is separated by comma.
          Example: "com.android.phone,com.android.stk,com.android.providers.telephony"
+         (Note: shell is included for testing purposes)
      -->
-    <string name="config_telephonyPackages" translatable="false">"com.android.phone,com.android.stk,com.android.providers.telephony,com.android.ons,com.android.cellbroadcastservice"</string>
+    <string name="config_telephonyPackages" translatable="false">"com.android.phone,com.android.stk,com.android.providers.telephony,com.android.ons,com.android.cellbroadcastservice,com.android.cellbroadcastreceiver,com.android.shell"</string>
 
     <!-- The component name for the default system attention service.
          This service must be trusted, as it can be activated without explicit consent of the user.
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 7f1d5280ab776..b89f1412c6a6c 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -221,6 +221,9 @@
       <!-- Permission required for CTS test - CarModeInCallServiceTest -->
     <uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
 
+    <!-- Permission requried for CTS test - CellBroadcastIntentsTest -->
+    <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS"/>
+
     <application android:label="@string/app_label"
                 android:theme="@android:style/Theme.DeviceDefault.DayNight"
                 android:defaultToDeviceProtectedStorage="true"