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

Jim Miller · Android Git Automerger · commit 0b92eb4b8c2c · 2012-01-12T13:37:58.000-08:00
* commit '1aff11be4585d6ddff784d7e74188963050805fa':
  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
@@ -585,8 +585,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
`@@ -585,8 +585,7 @@ public IccCard.State getSimState() {`
`585`	`585`	`* through mHandler, this must be called from the UI thread.`
`586`	`586`	`*/`
`587`	`587`	`public void reportSimUnlocked() {`
`588`		`- mSimState = IccCard.State.READY;`
`589`		`- handleSimStateChange(new SimArgs(mSimState));`
	`588`	`+ handleSimStateChange(new SimArgs(IccCard.State.READY));`
`590`	`589`	`}`
`591`	`590`
`592`	`591`	`public boolean isKeyguardBypassEnabled() {`