From 33edb43f6a41c485ab48c473511340d1f1596686 Mon Sep 17 00:00:00 2001
From: Linus Tufvesson <lus@google.com>
Date: Wed, 30 Dec 2020 15:44:24 +0000
Subject: [PATCH] Remove preinstalled from SYSTEM_ALERT_WINDOW

Preinstalled apps have to use the appOp.

Bug: 159616727
Bug: 176476754
Test: atest PermissionPolicyTest
Change-Id: I2451d51f4ab42a852992505c5e1919a3c01525d0
---
 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 8682fea1f8dc6..28851286734c4 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2676,11 +2676,11 @@
          The app can check whether it has this authorization by calling
          {@link android.provider.Settings#canDrawOverlays
          Settings.canDrawOverlays()}.
-         <p>Protection level: signature|preinstalled|appop|pre23|development -->
+         <p>Protection level: signature|appop|installer|pre23|development -->
     <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
         android:label="@string/permlab_systemAlertWindow"
         android:description="@string/permdesc_systemAlertWindow"
-        android:protectionLevel="signature|preinstalled|appop|pre23|development" />
+        android:protectionLevel="signature|appop|installer|pre23|development" />
 
     <!-- @deprecated Use {@link android.Manifest.permission#REQUEST_COMPANION_RUN_IN_BACKGROUND}
          @hide