summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jim Miller <jaggies@google.com> 2012-01-12 12:31:07 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-12 12:31:07 -0800
commit1aff11be4585d6ddff784d7e74188963050805fa (patch)
tree3e13b604cbbd76a33fd36b83bd1517bde88957ed
parent66e66e1d70bdcf184a29bc5eb8cfdeecffdb799f (diff)
parent7a286d8391a58637e6834f4de296bf66183ce1b2 (diff)
am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '7a286d8391a58637e6834f4de296bf66183ce1b2': Fix 5620754: don't show pattern screen after SIM PUK unlock
-rw-r--r--policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
index b4b82aa6fc88..d7041fc23d46 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
@@ -583,8 +583,7 @@ public class KeyguardUpdateMonitor {
* through mHandler, this *must* be called from the UI thread.
*/
public void reportSimUnlocked() {
- mSimState = IccCard.State.READY;
- handleSimStateChange(new SimArgs(mSimState));
+ handleSimStateChange(new SimArgs(IccCard.State.READY));
}
public boolean isKeyguardBypassEnabled() {