From 55ecaac312ae0c512d0c8aad09f9a3d226d40783 Mon Sep 17 00:00:00 2001 From: "Philip P. Moltmann" Date: Fri, 26 Apr 2019 16:56:09 -0700 Subject: [PATCH] Add new permission flags to @Flags int-def also expose all flags for being tested. Test: built Bug: 131188279 Change-Id: I2874298d87a76ee2bc95f18346d8ae597a3152ad --- api/test-current.txt | 1 + core/java/android/content/pm/PermissionInfo.java | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/api/test-current.txt b/api/test-current.txt index 62d8b206511e1..24b24915aeaeb 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java index 14340fe788f76..dd5c6a53cc20f 100644 --- a/core/java/android/content/pm/PermissionInfo.java +++ b/core/java/android/content/pm/PermissionInfo.java @@ -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 {}