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

Commit 1fd82783 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 

am: 4ac95fbe

Change-Id: I232671cc125875cdbe47067d2d2022966718d180
parents b1eaf643 4ac95fbe

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

+2 −3
Original line number Diff line number Diff line
@@ -3962,8 +3962,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 =
@@ -4512,7 +4510,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);