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

Commit b038c4f6 authored by Andrew Scull's avatar Andrew Scull Committed by Android (Google) Code Review
Browse files

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

parents 4549d8b4 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(