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

Commit 51171688 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for... 

am 7f210cbb: am 103a734b: Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev

* commit '7f210cbb':
  Fix bug where lockout timeout is shown for SIM in keyguard
parents 8360bde1 7f210cbb

packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java

+6 −1
Original line number Diff line number Diff line
@@ -82,13 +82,18 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 


        // if the user is currently locked out, enforce it.

        long deadline = mLockPatternUtils.getLockoutAttemptDeadline();

        if (deadline != 0) {

        if (shouldLockout(deadline)) {

            handleAttemptLockout(deadline);

        } else {

            resetState();

        }

    }



    // Allow subclasses to override this behavior

    protected boolean shouldLockout(long deadline) {

        return deadline != 0;

    }



    protected abstract int getPasswordTextViewId();

    protected abstract void resetState();

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+7 −1
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView 
        mPasswordEntry.setEnabled(true);

    }



    @Override

    protected boolean shouldLockout(long deadline) {

        // SIM PIN doesn't have a timed lockout

        return false;

    }



    @Override

    protected int getPasswordTextViewId() {

        return R.id.pinEntry;

packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java

+6 −0
Original line number Diff line number Diff line
@@ -106,6 +106,12 @@ public class KeyguardSimPukView extends KeyguardAbsKeyInputView 
        mPasswordEntry.setEnabled(true);

    }



    @Override

    protected boolean shouldLockout(long deadline) {

        // SIM PUK doesn't have a timed lockout

        return false;

    }



    @Override

    protected int getPasswordTextViewId() {

        return R.id.pinEntry;