Merge "Remove unnecessary WTFs from password state check" into pi-dev (24ba8398) · Commits · e / os / android_frameworks_base

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

+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);