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

Commit 76664d9d authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Work on issue #21589105: Scope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW..." into mnc-dev

parents f22e2e39 de15edaa

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9468,6 +9468,7 @@ package android.content.pm { 
    field public static final int PROTECTION_DANGEROUS = 1; // 0x1

    field public static final int PROTECTION_FLAG_APPOP = 64; // 0x40

    field public static final int PROTECTION_FLAG_DEVELOPMENT = 32; // 0x20

    field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80

    field public static final int PROTECTION_FLAG_SYSTEM = 16; // 0x10

    field public static final int PROTECTION_MASK_BASE = 15; // 0xf

    field public static final int PROTECTION_MASK_FLAGS = 240; // 0xf0

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9808,6 +9808,7 @@ package android.content.pm { 
    field public static final int PROTECTION_DANGEROUS = 1; // 0x1

    field public static final int PROTECTION_FLAG_APPOP = 64; // 0x40

    field public static final int PROTECTION_FLAG_DEVELOPMENT = 32; // 0x20

    field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80

    field public static final int PROTECTION_FLAG_SYSTEM = 16; // 0x10

    field public static final int PROTECTION_MASK_BASE = 15; // 0xf

    field public static final int PROTECTION_MASK_FLAGS = 240; // 0xf0

core/java/android/content/pm/PermissionInfo.java

+10 −0
Original line number Diff line number Diff line
@@ -75,6 +75,13 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
     */

    public static final int PROTECTION_FLAG_APPOP = 0x40;



    /**

     * Additional flag for {@link #protectionLevel}, corresponding

     * to the <code>pre23</code> value of

     * {@link android.R.attr#protectionLevel}.

     */

    public static final int PROTECTION_FLAG_PRE23 = 0x80;



    /**

     * Mask for {@link #protectionLevel}: the basic protection type.

     */
@@ -171,6 +178,9 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
        if ((level&PermissionInfo.PROTECTION_FLAG_APPOP) != 0) {

            protLevel += "|appop";

        }

        if ((level&PermissionInfo.PROTECTION_FLAG_PRE23) != 0) {

            protLevel += "|pre23";

        }

        return protLevel;

    }

core/java/android/widget/AppSecurityPermissions.java

+2 −1
Original line number Diff line number Diff line
@@ -553,7 +553,8 @@ public class AppSecurityPermissions { 
            int existingReqFlags) {

        final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE;

        final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL);

        final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS);

        final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS)

                || ((pInfo.protectionLevel&PermissionInfo.PROTECTION_FLAG_PRE23) != 0);

        final boolean isRequired =

                ((newReqFlags&PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 0);

        final boolean isDevelopment =

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ 
    <permission android:name="android.permission.SYSTEM_ALERT_WINDOW"

        android:label="@string/permlab_systemAlertWindow"

        android:description="@string/permdesc_systemAlertWindow"

        android:protectionLevel="signature|system|appop" />

        android:protectionLevel="signature|system|appop|pre23" />



    <!-- ================================== -->

    <!-- Permissions affecting the system wallpaper -->