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

Commit 3ccb3542 authored by Russell Brenner's avatar Russell Brenner Committed by Android (Google) Code Review
Browse files

Merge "Add new protection level for setup wizard" into nyc-dev

parents 032a76f9 b2334663

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9916,6 +9916,7 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80

    field public static final int PROTECTION_FLAG_PREINSTALLED = 1024; // 0x400

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

    field public static final int PROTECTION_FLAG_SETUP = 2048; // 0x800

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

    field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10315,6 +10315,7 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80

    field public static final int PROTECTION_FLAG_PREINSTALLED = 1024; // 0x400

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

    field public static final int PROTECTION_FLAG_SETUP = 2048; // 0x800

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

    field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200

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

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9926,6 +9926,7 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_PRE23 = 128; // 0x80

    field public static final int PROTECTION_FLAG_PREINSTALLED = 1024; // 0x400

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

    field public static final int PROTECTION_FLAG_SETUP = 2048; // 0x800

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

    field public static final int PROTECTION_FLAG_VERIFIER = 512; // 0x200

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

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

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

    public static final int PROTECTION_FLAG_PREINSTALLED = 0x400;



    /**

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

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

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

     */

    public static final int PROTECTION_FLAG_SETUP = 0x800;



    /**

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

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

            protLevel += "|preinstalled";

        }

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

            protLevel += "|setup";

        }

        return protLevel;

    }

core/res/res/values/attrs_manifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -225,6 +225,9 @@ 
            granted any application pre-installed on the system image (not just privileged

            apps). -->

        <flag name="preinstalled" value="0x400" />

        <!-- Additional flag from base permission type: this permission can be automatically

            granted to the setup wizard app -->

        <flag name="setup" value="0x800" />

    </attr>



    <!-- Flags indicating more context for a permission group. -->