Merge "Telephony: Reset of security message" (1ef0a357) · Commits · e / os / android_frameworks_base

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView

		protected ProgressDialog mSimUnlockProgressDialog = null;
		private CheckSimPin mCheckSimPinThread;

		protected boolean mShowDefaultMessage = true;
		protected AlertDialog mRemainingAttemptsDialog;
		public KeyguardSimPinView(Context context) {
		this(context, null);
		@@ -75,7 +75,9 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView
		}

		public void resetState() {
		if (mShowDefaultMessage) {
		mSecurityMessageDisplay.setMessage(R.string.kg_sim_pin_instructions, true);
		}
		mPasswordEntry.setEnabled(true);
		}

		@@ -262,6 +264,7 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView
		KeyguardUpdateMonitor.getInstance(getContext()).reportSimUnlocked();
		mCallback.dismiss(true);
		} else {
		mShowDefaultMessage = false;
		if (result == PhoneConstants.PIN_PASSWORD_INCORRECT) {
		if (attemptsRemaining <= 2) {
		// this is getting critical - show dialog

+5 −2

Original line number	Diff line number	Diff line
		@@ -140,8 +140,10 @@ public class MSimKeyguardSimPinView extends KeyguardSimPinView {
		}

		public void resetState() {
		if (mShowDefaultMessage) {
		mSecurityMessageDisplay.setMessage(
		getSecurityMessageDisplay(R.string.kg_sim_pin_instructions), true);
		}
		mPasswordEntry.setEnabled(true);
		}

		@@ -231,6 +233,7 @@ public class MSimKeyguardSimPinView extends KeyguardSimPinView {
		// so it knows right away.
		closeKeyGuard(true);
		} else {
		mShowDefaultMessage = false;
		if (result == PhoneConstants.PIN_PASSWORD_INCORRECT) {
		if (attemptsRemaining <= 2) {
		// this is getting critical - show dialog