From 45dd6667e8d42c9df6957fba7e4df99b92b805ea Mon Sep 17 00:00:00 2001 From: Benjamin Franz Date: Wed, 8 Jul 2015 14:24:14 +0100 Subject: Clarify javadoc of setPermissionPolicy Bug: 22192363 Change-Id: I552eae1e84ce866d9873faacb5c261321351915a --- core/java/android/app/admin/DevicePolicyManager.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index d28ff51fe268..66d9570a3da3 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -4328,10 +4328,17 @@ public class DevicePolicyManager { * requests by applications. The policy can allow for normal operation which prompts the * user to grant a permission, or can allow automatic granting or denying of runtime * permission requests by an application. This also applies to new permissions declared by app - * updates. + * updates. When a permission is denied or granted this way, the effect is equivalent to setting + * the permission grant state via {@link #setPermissionGrantState}. + * + *

As this policy only acts on runtime permission requests, it only applies to applications + * built with a {@code targetSdkVersion} of {@link android.os.Build.VERSION_CODES#MNC} or later. + * * @param admin Which profile or device owner this request is associated with. * @param policy One of the policy constants {@link #PERMISSION_POLICY_PROMPT}, * {@link #PERMISSION_POLICY_AUTO_GRANT} and {@link #PERMISSION_POLICY_AUTO_DENY}. + * + * @see #setPermissionGrantState */ public void setPermissionPolicy(@NonNull ComponentName admin, int policy) { try { -- cgit v1.2.3-59-g8ed1b