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

Commit cca00b0e authored by Andrew Scull's avatar Andrew Scull
Browse files

Only check password length for relevant qualities. 

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
parent 8653659c

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

+7 −3
Original line number Diff line number Diff line
@@ -3672,12 +3672,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(