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

Commit c2ca590e authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "FRP: Fix crash after lockout" into oc-mr1-dev

parents fdd6089a b7d81d9a

core/java/com/android/internal/widget/LockPatternUtils.java

+5 −0
Original line number Diff line number Diff line
@@ -1211,6 +1211,11 @@ public class LockPatternUtils { 
     */

    public long setLockoutAttemptDeadline(int userId, int timeoutMs) {

        final long deadline = SystemClock.elapsedRealtime() + timeoutMs;

        if (userId == USER_FRP) {

            // For secure password storage (that is required for FRP), the underlying storage also

            // enforces the deadline. Since we cannot store settings for the FRP user, don't.

            return deadline;

        }

        setLong(LOCKOUT_ATTEMPT_DEADLINE, deadline, userId);

        setLong(LOCKOUT_ATTEMPT_TIMEOUT_MS, timeoutMs, userId);

        return deadline;