diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-14 00:46:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-14 00:46:32 +0000 |
| commit | 4e659f426637f0a6eb28cc203b2a78ae505f289e (patch) | |
| tree | ac58d564057e9d7775b9298c6bf023e382a558a7 /core/java | |
| parent | 4c4f449ff2558e947fab593c0dfc2d69671fc379 (diff) | |
| parent | 1d1819246e6927750bf1bbfeae1774c66237b620 (diff) | |
Merge "Add marker flag for permissions revoked by auto-revoke"
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 6bee2dd65d76..ae147488e4d5 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3385,6 +3385,14 @@ public abstract class PackageManager { public static final int FLAG_PERMISSION_AUTO_REVOKE_USER_SET = 1 << 18; /** + * Permission flag: Whether permission was revoked by auto-revoke. + * + * @hide + */ + @SystemApi + public static final int FLAG_PERMISSION_AUTO_REVOKED = 1 << 20; + + /** * Permission flags: Reserved for use by the permission controller. * * @hide @@ -3437,7 +3445,8 @@ public abstract class PackageManager { | FLAG_PERMISSION_REVOKED_COMPAT | FLAG_PERMISSION_ONE_TIME | FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED - | FLAG_PERMISSION_AUTO_REVOKE_USER_SET; + | FLAG_PERMISSION_AUTO_REVOKE_USER_SET + | FLAG_PERMISSION_AUTO_REVOKED; /** * Injected activity in app that forwards user to setting activity of that app. @@ -4262,7 +4271,8 @@ public abstract class PackageManager { FLAG_PERMISSION_REVOKED_COMPAT, FLAG_PERMISSION_ONE_TIME, FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED, - FLAG_PERMISSION_AUTO_REVOKE_USER_SET + FLAG_PERMISSION_AUTO_REVOKE_USER_SET, + FLAG_PERMISSION_AUTO_REVOKED }) @Retention(RetentionPolicy.SOURCE) public @interface PermissionFlags {} @@ -7401,6 +7411,7 @@ public abstract class PackageManager { case FLAG_PERMISSION_ONE_TIME: return "ONE_TIME"; case FLAG_PERMISSION_AUTO_REVOKE_IF_UNUSED: return "AUTO_REVOKE_IF_UNUSED"; case FLAG_PERMISSION_AUTO_REVOKE_USER_SET: return "AUTO_REVOKE_USER_SET"; + case FLAG_PERMISSION_AUTO_REVOKED: return "AUTO_REVOKED"; default: return Integer.toString(flag); } } |