Merge "Only check password length for relevant qualities." (a58e1100) · Commits · e / os / android_frameworks_base

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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(