diff options
| author | Meng Wang <mewan@google.com> | 2021-04-12 20:09:07 +0000 |
|---|---|---|
| committer | Meng Wang <mewan@google.com> | 2021-04-12 22:26:57 +0000 |
| commit | 3c167fe9ca156179cc9529e81dc4113d5f7b19ea (patch) | |
| tree | f3eb4030a6dedc6b519280d91d25bdb81a375f0a /core/java/android | |
| parent | 8dd502135904480de9bc868e5517c42bfe8f197d (diff) | |
Revert "PasswordPolicy.getMinMetrics PIN"
This reverts commit 8dd502135904480de9bc868e5517c42bfe8f197d.
Reason for revert: DroidMonitor: Potential culprit for Bug 185150796 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Bug: 185150796
Change-Id: Ie6809d9e20b5c32c076e7a790095c65a2295781a
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/PasswordPolicy.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/core/java/android/app/admin/PasswordPolicy.java b/core/java/android/app/admin/PasswordPolicy.java index 0544a3666696..13f11ad74d12 100644 --- a/core/java/android/app/admin/PasswordPolicy.java +++ b/core/java/android/app/admin/PasswordPolicy.java @@ -20,7 +20,6 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_COMPLEX; -import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; @@ -28,7 +27,6 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_NONE; import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PASSWORD; import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PATTERN; -import static com.android.internal.widget.LockPatternUtils.CREDENTIAL_TYPE_PIN; /** * {@hide} @@ -60,20 +58,14 @@ public class PasswordPolicy { } else if (quality == PASSWORD_QUALITY_BIOMETRIC_WEAK || quality == PASSWORD_QUALITY_SOMETHING) { return new PasswordMetrics(CREDENTIAL_TYPE_PATTERN); - } else if (quality == PASSWORD_QUALITY_NUMERIC - || quality == PASSWORD_QUALITY_NUMERIC_COMPLEX) { - PasswordMetrics result = new PasswordMetrics(CREDENTIAL_TYPE_PIN); - result.length = length; - if (quality == PASSWORD_QUALITY_NUMERIC_COMPLEX) { - result.seqLength = PasswordMetrics.MAX_ALLOWED_SEQUENCE; - } - return result; - } // quality is ALPHABETIC or stronger. + } // quality is NUMERIC or stronger. PasswordMetrics result = new PasswordMetrics(CREDENTIAL_TYPE_PASSWORD); result.length = length; - if (quality == PASSWORD_QUALITY_ALPHABETIC) { + if (quality == PASSWORD_QUALITY_NUMERIC_COMPLEX) { + result.seqLength = PasswordMetrics.MAX_ALLOWED_SEQUENCE; + } else if (quality == PASSWORD_QUALITY_ALPHABETIC) { result.nonNumeric = 1; } else if (quality == PASSWORD_QUALITY_ALPHANUMERIC) { result.numeric = 1; |