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

Only check password length for relevant qualities.

Browse Source 
The minimum password length is only required for certain password
qualities so only check the minimum length in those cases.

Bug: 30109030
Change-Id: I330c88fc0b22179e126fc1241a9c58d5e0d73e8e
This commit is contained in:
Andrew Scull
2016-07-20 17:04:39 +01:00
parent 4b4ba90d66
commit 83ab85410b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -3672,12 +3672,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
private boolean isActivePasswordSufficientForUserLocked( private boolean isActivePasswordSufficientForUserLocked(
DevicePolicyData policy, int userHandle, boolean parent) { DevicePolicyData policy, int userHandle, boolean parent) {
if (policy.mActivePasswordQuality < getPasswordQuality(null, userHandle, parent) final int requiredPasswordQuality = getPasswordQuality(null, userHandle, parent);
|| policy.mActivePasswordLength < getPasswordMinimumLength( if (policy.mActivePasswordQuality < requiredPasswordQuality) {
return false;
}
if (requiredPasswordQuality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC
&& policy.mActivePasswordLength < getPasswordMinimumLength(
null, userHandle, parent)) { null, userHandle, parent)) {
return false; return false;
} }
if (policy.mActivePasswordQuality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) { if (requiredPasswordQuality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {
return true; return true;
} }
return policy.mActivePasswordUpperCase >= getPasswordMinimumUpperCase( return policy.mActivePasswordUpperCase >= getPasswordMinimumUpperCase(