summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorBartosz Fabianowski <bartfab@google.com>2017-01-16 11:47:28 +0100
committerBartosz Fabianowski <bartfab@google.com>2017-01-18 18:22:50 +0100
commit4b0624fee452138951de919bbe74003258e9bc19 (patch)
tree78fca8647891101dee35208585641870dce6f617 /core/java/android
parentb3a20ee45a23cfc65fb09f4a4841270fa885518c (diff)
Allow system to retrieve permission grant state
To inform the user which apps were granted permissions by the admin, the Settings app needs to access this information without being a DO/PO. Bug: 32692748 Test: FrameworksServicesTests unit test Change-Id: I3770ec6343b85be9c6f7655675ed6db5cb50612c
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index c95e0113e801..b8b9793c39a0 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6317,7 +6317,7 @@ public class DevicePolicyManager {
* @see #setPermissionGrantState(ComponentName, String, String, int)
* @see PackageManager#checkPermission(String, String)
*/
- public int getPermissionGrantState(@NonNull ComponentName admin, String packageName,
+ public int getPermissionGrantState(@Nullable ComponentName admin, String packageName,
String permission) {
throwIfParentInstance("getPermissionGrantState");
try {