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

Commit 4ac95fbe authored by Eran Messeri's avatar Eran Messeri Committed by android-build-merger
Browse files

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

am: 24ba8398

Change-Id: I8a8c66ba6bb0c83c1f57cfd48761863d3a8a4f72
parents 87bbfe05 24ba8398
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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);