summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-04-17 10:53:36 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-04-17 10:53:36 +0000
commit5037beea1c118ee9aa9d9d3f314a228d5f80c727 (patch)
treeb1281bf042399298310079b7ff30f2426a96f5c5
parent421ec104af61a9ce9df55e8749aeec7f8383ab34 (diff)
parent8040fd1b62ee4dbb8ac3941f3666d7fbe6bcd3e6 (diff)
Merge "Docs: update the method description for installKeyPair() to cover parameter change." into pi-dev
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 61aaad216391..2feb459bcbdb 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -4066,8 +4066,8 @@ public class DevicePolicyManager {
* immediately, without user approval. It is a best practice not to request this unless strictly
* necessary since it opens up additional security vulnerabilities.
*
- * <p>Whether this key is offered to the user for approval at all or not depends on the
- * {@code isUserSelectable} parameter.
+ * <p>Include {@link #INSTALLKEY_SET_USER_SELECTABLE} in the {@code flags} argument to allow
+ * the user to select the key from a dialog.
*
* @param admin Which {@link DeviceAdminReceiver} this request is associated with, or
* {@code null} if calling from a delegated certificate installer.