Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev (103a734b) · Commits · e / os / android_frameworks_base

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

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

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