summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-04-16 14:48:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-04-16 14:48:19 +0000
commitbdf8f1e3a2ac7a6e91bd77bd6d2db4964aed7141 (patch)
tree162e5ef0206022ddd9f2fbcb89ccf97b122cc4e4
parent3c074aacc2dae02d649872a5c75c6523c758d650 (diff)
parentcc12c5fb1152188ebe3da21b35dd39b932121c34 (diff)
Merge "Doc change: removed reference to the reverted Password Blacklist feature." into pi-dev
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index c491dccbbde1..61aaad216391 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -2758,8 +2758,7 @@ public class DevicePolicyManager {
* Determine whether the current password the user has set is sufficient to meet the policy
* requirements (e.g. quality, minimum length) that have been requested by the admins of this
* user and its participating profiles. Restrictions on profiles that have a separate challenge
- * are not taken into account. The user must be unlocked in order to perform the check. The
- * password blacklist is not considered when checking sufficiency.
+ * are not taken into account. The user must be unlocked in order to perform the check.
* <p>
* The calling device admin must have requested
* {@link DeviceAdminInfo#USES_POLICY_LIMIT_PASSWORD} to be able to call this method; if it has