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

Merge "Remove unnecessary WTFs from password state check" into pi-dev

Browse Source
This commit is contained in:
Eran Messeri
2018-04-25 09:28:15 +00:00
committed by Android (Google) Code Review
parent 728cb519a5 3c26b8f92e
commit 24ba8398fe
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3961,8 +3961,6 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
DevicePolicyData policy = getUserData(credentialOwner);
PasswordMetrics metrics = getUserPasswordMetricsLocked(credentialOwner);
if (metrics == null) {
Slog.wtf(LOG_TAG, "Should have had a valid password metrics for updating checkpoint " +
"validity.");
metrics = new PasswordMetrics();
}
policy.mPasswordValidAtLastCheckpoint =
@@ -4511,7 +4509,8 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
if (metrics == null) {
Slog.wtf(LOG_TAG, "FBE device, should have been unlocked and had valid metrics.");
// This could happen if the user never had a password set, for example, so
// setActivePasswordState has never been called for it.
metrics = new PasswordMetrics();
}
return isPasswordSufficientForUserWithoutCheckpointLocked(metrics, userHandle, parent);