summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2015-07-08 14:24:14 +0100
committerBenjamin Franz <bfranz@google.com>2015-07-08 14:37:28 +0100
commit45dd6667e8d42c9df6957fba7e4df99b92b805ea (patch)
tree38c15ecfff68e367e0e258867ae24510d5ce3cde /core
parent72a77993bdbc2cec49714b73d222ff213be44041 (diff)
downloadframeworks_base-45dd6667e8d42c9df6957fba7e4df99b92b805ea.zip
frameworks_base-45dd6667e8d42c9df6957fba7e4df99b92b805ea.tar.gz
frameworks_base-45dd6667e8d42c9df6957fba7e4df99b92b805ea.tar.bz2
Clarify javadoc of setPermissionPolicy
Bug: 22192363 Change-Id: I552eae1e84ce866d9873faacb5c261321351915a
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index d28ff51..66d9570 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}.
+ *
+ * <p/>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 {