am 7a286d8: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1

Jim Miller · Android Git Automerger · commit 1aff11be4585 · 2012-01-12T12:31:07.000-08:00
* commit '7a286d8391a58637e6834f4de296bf66183ce1b2':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
diff --git 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 IccCard.State getSimState() {
      * 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() {

Original file line number	Diff line number	Diff line change
`@@ -583,8 +583,7 @@ public IccCard.State getSimState() {`
`583`	`583`	`* through mHandler, this must be called from the UI thread.`
`584`	`584`	`*/`
`585`	`585`	`public void reportSimUnlocked() {`
`586`		`- mSimState = IccCard.State.READY;`
`587`		`- handleSimStateChange(new SimArgs(mSimState));`
	`586`	`+ handleSimStateChange(new SimArgs(IccCard.State.READY));`
`588`	`587`	`}`
`589`	`588`
`590`	`589`	`public boolean isKeyguardBypassEnabled() {`