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

Commit ad85c7be authored by Russell Brenner's avatar Russell Brenner Committed by android-build-merger
Browse files

Merge "Add new protection level for setup wizard" into nyc-dev am: 3ccb3542 

am: 395db247

* commit '395db247':
  Add new protection level for setup wizard

Change-Id: Ic6287b5bdaa66ffd4cfdc094329557ba12afd6a3
parents 1e9681c5 395db247

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9919,6 +9919,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
@@ -10318,6 +10318,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
@@ -9929,6 +9929,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. -->