Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1dc062e authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Android (Google) Code Review
Browse files

Merge "Re-add preinstalled for SYSTEM_ALERT_WINDOW"

parents 2c38bd53 620373b9
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -2676,11 +2676,11 @@
         The app can check whether it has this authorization by calling
         The app can check whether it has this authorization by calling
         {@link android.provider.Settings#canDrawOverlays
         {@link android.provider.Settings#canDrawOverlays
         Settings.canDrawOverlays()}.
         Settings.canDrawOverlays()}.
         <p>Protection level: signature|appop|installer|pre23|development|recents -->
         <p>Protection level: signature|appop|preinstalled|pre23|development -->
    <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
    <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
        android:label="@string/permlab_systemAlertWindow"
        android:label="@string/permlab_systemAlertWindow"
        android:description="@string/permdesc_systemAlertWindow"
        android:description="@string/permdesc_systemAlertWindow"
        android:protectionLevel="signature|appop|installer|pre23|development|recents" />
        android:protectionLevel="signature|appop|preinstalled|pre23|development" />


    <!-- @SystemApi @hide Allows an application to create windows using the type
    <!-- @SystemApi @hide Allows an application to create windows using the type
         {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY},
         {@link android.view.WindowManager.LayoutParams#TYPE_APPLICATION_OVERLAY},