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

Merge "Only check password length for relevant qualities." into nyc-mr1-dev

Browse Source
This commit is contained in:
Andrew Scull
2016-08-25 14:50:27 +00:00
committed by Android (Google) Code Review
parent 4549d8b4aa 83ab85410b
commit b038c4f617
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

@@ -3673,12 +3673,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(