Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DPM: Fix regression from I54376f60ac53451ace22965d331b47cd8c2e614e" into oc-mr1-dev

Browse Source
This commit is contained in:
Adrian Roos
2019-01-08 18:45:44 +00:00
committed by Android (Google) Code Review
parent 68670c2f77 48d06522c6
commit 79c2376045
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -4346,26 +4346,22 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
private boolean resetPasswordInternal(String password, long tokenHandle, byte[] token, private boolean resetPasswordInternal(String password, long tokenHandle, byte[] token,
int flags, int callingUid, int userHandle) { int flags, int callingUid, int userHandle) {
int quality; int quality;
final int realQuality;
synchronized (this) { synchronized (this) {
quality = getPasswordQuality(null, userHandle, /* parent */ false); quality = getPasswordQuality(null, userHandle, /* parent */ false);
if (quality == DevicePolicyManager.PASSWORD_QUALITY_MANAGED) { if (quality == DevicePolicyManager.PASSWORD_QUALITY_MANAGED) {
quality = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; quality = DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
} }
final PasswordMetrics metrics = PasswordMetrics.computeForPassword(password); final PasswordMetrics metrics = PasswordMetrics.computeForPassword(password);
realQuality = metrics.quality; final int realQuality = metrics.quality;
if (quality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { if (realQuality < quality
&& quality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) {
if (realQuality < quality Slog.w(LOG_TAG, "resetPassword: password quality 0x"
&& quality != DevicePolicyManager.PASSWORD_QUALITY_COMPLEX) { + Integer.toHexString(realQuality)
Slog.w(LOG_TAG, "resetPassword: password quality 0x" + " does not meet required quality 0x"
+ Integer.toHexString(realQuality) + Integer.toHexString(quality));
+ " does not meet required quality 0x" return false;
+ Integer.toHexString(quality));
return false;
}
quality = Math.max(realQuality, quality);
} }
quality = Math.max(realQuality, quality);
int length = getPasswordMinimumLength(null, userHandle, /* parent */ false); int length = getPasswordMinimumLength(null, userHandle, /* parent */ false);
if (password.length() < length) { if (password.length() < length) {
Slog.w(LOG_TAG, "resetPassword: password length " + password.length() Slog.w(LOG_TAG, "resetPassword: password length " + password.length()
@@ -4442,7 +4438,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
try { try {
if (token == null) { if (token == null) {
if (!TextUtils.isEmpty(password)) { if (!TextUtils.isEmpty(password)) {
mLockPatternUtils.saveLockPassword(password, null, realQuality, userHandle); mLockPatternUtils.saveLockPassword(password, null, quality, userHandle);
} else { } else {
mLockPatternUtils.clearLock(null, userHandle); mLockPatternUtils.clearLock(null, userHandle);
} }
@@ -4451,7 +4447,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
result = mLockPatternUtils.setLockCredentialWithToken(password, result = mLockPatternUtils.setLockCredentialWithToken(password,
TextUtils.isEmpty(password) ? LockPatternUtils.CREDENTIAL_TYPE_NONE TextUtils.isEmpty(password) ? LockPatternUtils.CREDENTIAL_TYPE_NONE
: LockPatternUtils.CREDENTIAL_TYPE_PASSWORD, : LockPatternUtils.CREDENTIAL_TYPE_PASSWORD,
realQuality, tokenHandle, token, userHandle); quality, tokenHandle, token, userHandle);
} }
boolean requireEntry = (flags & DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY) != 0; boolean requireEntry = (flags & DevicePolicyManager.RESET_PASSWORD_REQUIRE_ENTRY) != 0;
if (requireEntry) { if (requireEntry) {