Merge "FRP: save password quality in DPM.resetPassword" am: 08d4eb174d (38d5c1e8) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/LockPatternUtils.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -836,6 +836,11 @@ public class LockPatternUtils {
		+ "of length " + MIN_LOCK_PASSWORD_SIZE);
		}

		if (requestedQuality < PASSWORD_QUALITY_NUMERIC) {
		throw new IllegalArgumentException("quality must be at least NUMERIC, but was "
		+ requestedQuality);
		}

		final int currentQuality = getKeyguardStoredPasswordQuality(userHandle);
		setKeyguardStoredPasswordQuality(
		computePasswordQuality(CREDENTIAL_TYPE_PASSWORD, password, requestedQuality),

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -4789,14 +4789,16 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		private boolean resetPasswordInternal(String password, long tokenHandle, byte[] token,
		int flags, int callingUid, int userHandle) {
		int quality;
		final int realQuality;
		synchronized (getLockObject()) {
		quality = getPasswordQuality(null, userHandle, /* parent */ false);
		if (quality == DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
		quality = PASSWORD_QUALITY_UNSPECIFIED;
		}
		final PasswordMetrics metrics = PasswordMetrics.computeForPassword(password);
		realQuality = metrics.quality;
		if (quality != PASSWORD_QUALITY_UNSPECIFIED) {
		final int realQuality = metrics.quality;

		if (realQuality < quality
		&& quality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {
		Slog.w(LOG_TAG, "resetPassword: password quality 0x"
		@@ -4883,7 +4885,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		try {
		if (token == null) {
		if (!TextUtils.isEmpty(password)) {
		mLockPatternUtils.saveLockPassword(password, null, quality, userHandle);
		mLockPatternUtils.saveLockPassword(password, null, realQuality, userHandle);
		} else {
		mLockPatternUtils.clearLock(null, userHandle);
		}
		@@ -4892,7 +4894,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
		result = mLockPatternUtils.setLockCredentialWithToken(password,
		TextUtils.isEmpty(password) ? LockPatternUtils.CREDENTIAL_TYPE_NONE
		: LockPatternUtils.CREDENTIAL_TYPE_PASSWORD,
		quality, tokenHandle, token, userHandle);
		realQuality, tokenHandle, token, userHandle);
		}
		boolean requireEntry = (flags & DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY) != 0;
		if (requireEntry) {

services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -4181,7 +4181,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
		// test reset password with token
		when(getServices().lockPatternUtils.setLockCredentialWithToken(eq(password),
		eq(LockPatternUtils.CREDENTIAL_TYPE_PASSWORD),
		eq(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED), eq(handle), eq(token),
		eq(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC), eq(handle), eq(token),
		eq(UserHandle.USER_SYSTEM)))
		.thenReturn(true);
		assertTrue(dpm.resetPasswordWithToken(admin1, password, token, 0));