summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2019-03-08 21:34:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-08 21:34:01 +0000
commit8af0210f0ee74dbbb808f2bd05804b2bad257200 (patch)
tree5be4d637d0efd63da4ef9a3288c8e7fcdbf04405 /core/java/android
parentd1bd76539289cc5e1ac3aecf7c591957eab02313 (diff)
parentfc202f748ff9fbd827ae1a073cf24f5eba9e3e9d (diff)
Merge "Get permissions flags with GET_RUNTIME_PERMISSION"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/pm/PackageManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 7d05d508ef77..d1ebcfdaca3a 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -3867,7 +3867,8 @@ public abstract class PackageManager {
@TestApi
@RequiresPermission(anyOf = {
android.Manifest.permission.GRANT_RUNTIME_PERMISSIONS,
- android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS
+ android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS,
+ android.Manifest.permission.GET_RUNTIME_PERMISSIONS
})
public abstract @PermissionFlags int getPermissionFlags(String permissionName,
String packageName, @NonNull UserHandle user);