From 875c30c5fc56a2f4d7fe222039bcc60b0c5d91c6 Mon Sep 17 00:00:00 2001
From: Linus Tufvesson <lus@google.com>
Date: Mon, 18 Jan 2021 14:29:28 +0000
Subject: [PATCH] Remove preinstalled from SYSTEM_ALERT_WINDOW

Adding installer, recents and appPredictor as they each currently have
critical dependencies on SAW.

Bug: 159616727
Bug: 173782393
Test: Manully verified that the permission is granted to the apps listed
above

Change-Id: I9e910cd66ae6760dd9669a5061535a9f00e8f1d4
---
 core/res/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 396f95446bf63..4a0a35de7c17e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2697,11 +2697,11 @@
          The app can check whether it has this authorization by calling
          {@link android.provider.Settings#canDrawOverlays
          Settings.canDrawOverlays()}.
-         <p>Protection level: signature|appop|preinstalled|pre23|development -->
+         <p>Protection level: signature|appop|installer|recents|appPredictor|pre23|development -->
     <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
         android:label="@string/permlab_systemAlertWindow"
         android:description="@string/permdesc_systemAlertWindow"
-        android:protectionLevel="signature|appop|preinstalled|pre23|development" />
+        android:protectionLevel="signature|appop|installer|recents|appPredictor|pre23|development" />
 
     <!-- @SystemApi @hide Allows an application to create windows using the type
          {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY},