Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fce4b4ac authored by Andrew Scull's avatar Andrew Scull Committed by android-build-merger
Browse files

Only check password length for relevant qualities. 

am: 83ab8541

Change-Id: I89354ab06c70fd7b23d32aeebf84df85f6375765
parents 10acdf7a 83ab8541

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

+7 −3
Original line number Diff line number Diff line
@@ -3673,12 +3673,16 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 


    private boolean isActivePasswordSufficientForUserLocked(

            DevicePolicyData policy, int userHandle, boolean parent) {

        if (policy.mActivePasswordQuality < getPasswordQuality(null, userHandle, parent)

                || policy.mActivePasswordLength < getPasswordMinimumLength(

        final int requiredPasswordQuality = getPasswordQuality(null, userHandle, parent);

        if (policy.mActivePasswordQuality < requiredPasswordQuality) {

            return false;

        }

        if (requiredPasswordQuality >= DevicePolicyManager.PASSWORD_QUALITY_NUMERIC

                && policy.mActivePasswordLength < getPasswordMinimumLength(

                        null, userHandle, parent)) {

            return false;

        }

        if (policy.mActivePasswordQuality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {

        if (requiredPasswordQuality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {

            return true;

        }

        return policy.mActivePasswordUpperCase >= getPasswordMinimumUpperCase(