summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-03-01 02:55:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-03-01 02:55:04 +0000
commita88d34bfa7bb4b67e0801381e7fc61e99734d523 (patch)
tree2a4b55baff40a7d1e8a36773fa7adb6e71455550
parentd4596b4ed3cab304416714fd52e4a2b0d481d66c (diff)
parente4bab18190d2d736ec51f9e940f391129fe7b220 (diff)
Merge "Fixed PASSWORD_COMPLEXITY_HIGH javadoc to require complex PIN of length at least 8"
-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 a32e01fb68e5..d593ad1fd0cd 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -59,7 +59,6 @@ import android.os.Build;
import android.os.Bundle;
import android.os.ParcelFileDescriptor;
import android.os.Parcelable;
-import android.os.ParcelableException;
import android.os.PersistableBundle;
import android.os.Process;
import android.os.RemoteCallback;
@@ -1453,7 +1452,7 @@ public class DevicePolicyManager {
* Constant for {@link #getPasswordComplexity()}: password satisfies one of the following:
* <ul>
* <li>PIN with <b>no</b> repeating (4444) or ordered (1234, 4321, 2468) sequences, length at
- * least 4
+ * least 8
* <li>alphabetic, length at least 6
* <li>alphanumeric, length at least 6
* </ul>