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

Commit a1f2f3eb authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Change protection level from ephemeral to instant" into oc-mr1-dev 

am: ef2e7d27

Change-Id: I17616757875f0d2ea6a9d6f700b1c401a459fc39
parents c25cb8f9 ef2e7d27

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10887,6 +10887,7 @@ package android.content.pm { 
    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_INSTALLER = 256; // 0x100

    field public static final int PROTECTION_FLAG_INSTANT = 4096; // 0x1000

    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

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11602,8 +11602,8 @@ 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_EPHEMERAL = 4096; // 0x1000

    field public static final int PROTECTION_FLAG_INSTALLER = 256; // 0x100

    field public static final int PROTECTION_FLAG_INSTANT = 4096; // 0x1000

    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

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10928,8 +10928,8 @@ 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_EPHEMERAL = 4096; // 0x1000

    field public static final int PROTECTION_FLAG_INSTALLER = 256; // 0x100

    field public static final int PROTECTION_FLAG_INSTANT = 4096; // 0x1000

    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

core/java/android/content/pm/PackageParser.java

+2 −2
Original line number Diff line number Diff line
@@ -3235,11 +3235,11 @@ public class PackageParser { 
        perm.info.protectionLevel = PermissionInfo.fixProtectionLevel(perm.info.protectionLevel);



        if ((perm.info.protectionLevel&PermissionInfo.PROTECTION_MASK_FLAGS) != 0) {

            if ( (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_EPHEMERAL) == 0

            if ( (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_INSTANT) == 0

                    && (perm.info.protectionLevel&PermissionInfo.PROTECTION_FLAG_RUNTIME_ONLY) == 0

                    && (perm.info.protectionLevel&PermissionInfo.PROTECTION_MASK_BASE) !=

                    PermissionInfo.PROTECTION_SIGNATURE) {

                outError[0] = "<permission>  protectionLevel specifies a non-ephemeral flag but is "

                outError[0] = "<permission>  protectionLevel specifies a non-instnat flag but is "

                        + "not based on signature type";

                mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED;

                return false;

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

+4 −7
Original line number Diff line number Diff line
@@ -122,13 +122,10 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 


    /**

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

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

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

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

     * @hide

     */

    @SystemApi

    @TestApi

    public static final int PROTECTION_FLAG_EPHEMERAL = 0x1000;

    public static final int PROTECTION_FLAG_INSTANT = 0x1000;



    /**

     * Additional flag for {@link #protectionLevel}, corresponding
@@ -254,8 +251,8 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
        if ((level&PermissionInfo.PROTECTION_FLAG_SETUP) != 0) {

            protLevel += "|setup";

        }

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

            protLevel += "|ephemeral";

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

            protLevel += "|instant";

        }

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

            protLevel += "|runtime";