Merge "Fix bug where lockout timeout is shown for SIM in keyguard" into klp-dev

This commit is contained in:
Jim Miller
2013-10-13 22:54:21 +00:00
committed by Android (Google) Code Review
3 changed files with 19 additions and 2 deletions

View File

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

View File

@ -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;
@ -169,7 +175,7 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView
@Override
protected void verifyPasswordAndUnlock() {
String entry = mPasswordEntry.getText().toString();
if (entry.length() < 4) {
// otherwise, display a message to the user, and don't submit.
mSecurityMessageDisplay.setMessage(R.string.kg_invalid_sim_pin_hint, true);

View File

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