Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-03 23:55:33 +00:00
committed by Android (Google) Code Review
parent acf3529cde 55ecaac312
commit 94c556a2aa
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/test-current.txt
View File

@@ -731,6 +731,7 @@ package android.content.pm {
} }
public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable { 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_APP_PREDICTOR = 2097152; // 0x200000
field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000 field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000
field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000 field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000

8
core/java/android/content/pm/PermissionInfo.java
View File

@@ -316,6 +316,7 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
* value of {@link android.R.attr#permissionFlags}. * value of {@link android.R.attr#permissionFlags}.
* @hide * @hide
*/ */
@TestApi
@SystemApi @SystemApi
public static final int FLAG_REMOVED = 1<<1; public static final int FLAG_REMOVED = 1<<1;
@@ -360,8 +361,11 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
/** @hide */ /** @hide */
@IntDef(flag = true, prefix = { "FLAG_" }, value = { @IntDef(flag = true, prefix = { "FLAG_" }, value = {
FLAG_COSTS_MONEY, FLAG_COSTS_MONEY,
FLAG_INSTALLED, FLAG_REMOVED,
FLAG_REMOVED FLAG_HARD_RESTRICTED,
FLAG_SOFT_RESTRICTED,
FLAG_IMMUTABLY_RESTRICTED,
FLAG_INSTALLED
}) })
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
public @interface Flags {} public @interface Flags {}