From 4df25df8edec73b0856ff9a93e838b84b54d916a Mon Sep 17 00:00:00 2001
From: Rajeev Kumar <rajekumar@google.com>
Date: Thu, 25 Jun 2020 17:07:50 -0700
Subject: [PATCH] Add privapp permissions permission for
 com.android.cellbroadcastreceiver package.

Bug: 159544147
Fixes: 159544147
Test: Built a system image with this change and flashed
a device with it and the device booted successfully.

Change-Id: I7fd5080aa740fcfcebeb4f934d0a3fc39d847cc9
Merged-In: I7fd5080aa740fcfcebeb4f934d0a3fc39d847cc9
---
 data/etc/Android.bp                           |  8 ++++++
 .../etc/com.android.cellbroadcastreceiver.xml | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 data/etc/com.android.cellbroadcastreceiver.xml

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 0d12e1f7f83da..99b5a062e44e1 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -49,6 +49,14 @@ prebuilt_etc {
     filename_from_src: true,
 }
 
+prebuilt_etc {
+    name: "privapp_whitelist_com.android.cellbroadcastreceiver",
+    system_ext_specific: true,
+    sub_dir: "permissions",
+    src: "com.android.cellbroadcastreceiver.xml",
+    filename_from_src: true,
+}
+
 prebuilt_etc {
     name: "privapp_whitelist_com.android.contacts",
     product_specific: true,
diff --git a/data/etc/com.android.cellbroadcastreceiver.xml b/data/etc/com.android.cellbroadcastreceiver.xml
new file mode 100644
index 0000000000000..dd2df42e442f7
--- /dev/null
+++ b/data/etc/com.android.cellbroadcastreceiver.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ 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
+  -->
+<permissions>
+    <privapp-permissions package="com.android.cellbroadcastreceiver">
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.MODIFY_PHONE_STATE"/>
+        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
+        <permission name="android.permission.RECEIVE_EMERGENCY_BROADCAST"/>
+        <permission name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"/>
+    </privapp-permissions>
+</permissions>