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

Commit 34541a6c authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Add new permission flags to @Flags int-def" into qt-dev 

am: 94c556a2

Change-Id: I743a3d30814f32838c3e14a065956dada0881103
parents d718be96 94c556a2

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -731,6 +731,7 @@ package android.content.pm { 
  }



  public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

    field public static final int FLAG_REMOVED = 2; // 0x2

    field public static final int PROTECTION_FLAG_APP_PREDICTOR = 2097152; // 0x200000

    field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000

    field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000

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

+6 −2
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
     * value of {@link android.R.attr#permissionFlags}.

     * @hide

     */

    @TestApi

    @SystemApi

    public static final int FLAG_REMOVED = 1<<1;
@@ -360,8 +361,11 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
    /** @hide */

    @IntDef(flag = true, prefix = { "FLAG_" }, value = {

            FLAG_COSTS_MONEY,

            FLAG_INSTALLED,

            FLAG_REMOVED

            FLAG_REMOVED,

            FLAG_HARD_RESTRICTED,

            FLAG_SOFT_RESTRICTED,

            FLAG_IMMUTABLY_RESTRICTED,

            FLAG_INSTALLED

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface Flags {}