am 4b7d3b47: am 051762f7: am c088e30f: Merge "Clarify javadoc of setPermissionPolicy" into mnc-dev

* commit '4b7d3b477f4405d5afe7f116e14037ac7c70e414':
  Clarify javadoc of setPermissionPolicy

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 f2c907aec31f..33cbc9d8c737 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -4330,10 +4330,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 {