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

Unverified Commit 105cb6fe authored by Adrian Roos's avatar Adrian Roos Committed by Kevin F. Haggerty
Browse files

DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e 

Fixes an issue where setting a password via DPM would never
satisfy a QUALITY_COMPLEX password requirement.

Change-Id: I3fbc952bd44291ac22728c626b128fc0c1aae232
Merged-In: I3fbc952bd44291ac22728c626b128fc0c1aae232
Fixes: 120915644
Bug: 110172241
Test: atest 'com.android.cts.devicepolicy.DeviceAdminHostSideTestApi24#testRunDeviceOwnerPasswordTest'
Test: Set credential via DPM.resetPassword(), factory reset device to trigger FRP, verify FRP shows.
(cherry picked from commit 48d06522)
parent ff9b71a6

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

+11 −15
Original line number Diff line number Diff line
@@ -4347,16 +4347,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    private boolean resetPasswordInternal(String password, long tokenHandle, byte[] token,

            int flags, int callingUid, int userHandle) {

        int quality;

        final int realQuality;

        synchronized (this) {

            quality = getPasswordQuality(null, userHandle, /* parent */ false);

            if (quality == DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {

                quality = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;

            }

            final PasswordMetrics metrics = PasswordMetrics.computeForPassword(password);

            realQuality = metrics.quality;

            if (quality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {



            final int realQuality = metrics.quality;

            if (realQuality < quality

                    && quality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {

                Slog.w(LOG_TAG, "resetPassword: password quality 0x"
@@ -4366,7 +4363,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                return false;

            }

            quality = Math.max(realQuality, quality);

            }

            int length = getPasswordMinimumLength(null, userHandle, /* parent */ false);

            if (password.length() < length) {

                Slog.w(LOG_TAG, "resetPassword: password length " + password.length()
@@ -4443,7 +4439,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        try {

            if (token == null) {

                if (!TextUtils.isEmpty(password)) {

                    mLockPatternUtils.saveLockPassword(password, null, realQuality, userHandle);

                    mLockPatternUtils.saveLockPassword(password, null, quality, userHandle);

                } else {

                    mLockPatternUtils.clearLock(null, userHandle);

                }
@@ -4452,7 +4448,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                result = mLockPatternUtils.setLockCredentialWithToken(password,

                        TextUtils.isEmpty(password) ? LockPatternUtils.CREDENTIAL_TYPE_NONE

                                : LockPatternUtils.CREDENTIAL_TYPE_PASSWORD,

                        realQuality, tokenHandle, token, userHandle);

                        quality, tokenHandle, token, userHandle);

            }

            boolean requireEntry = (flags & DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY) != 0;

            if (requireEntry) {