Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev

Browse Source
This commit is contained in:
Meng Wang
2021-04-12 23:22:21 +00:00
committed by Android (Google) Code Review
parent 05a37fac59 3c167fe9ca
commit 6517e68d15
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/admin/PasswordPolicy.java
View File

@@ -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;

5
core/tests/coretests/src/android/app/admin/PasswordPolicyTest.java
View File

@@ -28,7 +28,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;
import static org.junit.Assert.assertEquals;
@@ -81,7 +80,7 @@ public class PasswordPolicyTest {
public void testGetMinMetrics_numeric() {
PasswordPolicy policy = testPolicy(PASSWORD_QUALITY_NUMERIC);
PasswordMetrics minMetrics = policy.getMinMetrics();
assertEquals(CREDENTIAL_TYPE_PIN, minMetrics.credType);
assertEquals(CREDENTIAL_TYPE_PASSWORD, minMetrics.credType);
assertEquals(TEST_VALUE, minMetrics.length);
assertEquals(0, minMetrics.numeric); // numeric can doesn't really require digits.
assertEquals(0, minMetrics.letters);
@@ -105,7 +104,7 @@ public class PasswordPolicyTest {
public void testGetMinMetrics_numericComplex() {
PasswordPolicy policy = testPolicy(PASSWORD_QUALITY_NUMERIC_COMPLEX);
PasswordMetrics minMetrics = policy.getMinMetrics();
assertEquals(CREDENTIAL_TYPE_PIN, minMetrics.credType);
assertEquals(CREDENTIAL_TYPE_PASSWORD, minMetrics.credType);
assertEquals(TEST_VALUE, minMetrics.length);
assertEquals(0, minMetrics.numeric);
assertEquals(0, minMetrics.letters);