From 5e390e7998f4aba46c13b1566cdfb8152ee40f0b Mon Sep 17 00:00:00 2001
From: Bernardo Rufino <brufino@google.com>
Date: Thu, 14 Jan 2021 10:10:45 +0000
Subject: [PATCH] [Attempt #2] Add privileged to BROADCAST_CLOSE_SYSTEM_DIALOGS

Original CL got reverted because target aosp_arm64-userdebug was failing
to boot. Apparently, the right place to put the permission for launcher3
is in frameworks/base/data/etc/com.android.launcher3.xml, not
frameworks/base/data/etc/privapp-permissions-platform.xml (despite it
having an entry on the latter) because launcher3 lives in system_ext.

-- Original CL description

CellBroadcastReceiver, a mainline module signed with the networkstack,
needs it before showing emergency alerts to the user.

This is inline and ok with the rest of of the restrictions given that
STATUS_BAR that allows calls to StatusBarManager.collapsePanels() also
has "privileged" protection level.

Also adding permission to privapp-permissions-platform for Launcher3
because of b/177506944, despite it getting it via "recents" protection
level.

Bug: 177346942
Bug: 159105552
Test: atest PermissionPolicyTest
Test: Run DeviceBootTest for aosp_arm64-userdebug in forrest.
Change-Id: Ie3298c839003aeaca3cc84782e8846374beca5b8
---
 core/res/AndroidManifest.xml       | 2 +-
 data/etc/com.android.launcher3.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index ce3ed9dc8ba63..fcc665a5cea85 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -4297,7 +4297,7 @@
          <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"
-        android:protectionLevel="signature|recents" />
+        android:protectionLevel="signature|privileged|recents" />
     <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
 
     <!-- Allows an application to broadcast a notification that an application
diff --git a/data/etc/com.android.launcher3.xml b/data/etc/com.android.launcher3.xml
index 17d614e3409ca..99c38dbe6ac99 100644
--- a/data/etc/com.android.launcher3.xml
+++ b/data/etc/com.android.launcher3.xml
@@ -20,5 +20,6 @@
         <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
         <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
         <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
     </privapp-permissions>
 </permissions>