Merge "Fix regression in SIM state handling"

Jim Miller · Android (Google) Code Review · commit dd0d0ba654ce · 2012-07-13T15:43:15.000-07:00
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardViewProperties.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardViewProperties.java
@@ -58,7 +58,6 @@ private boolean isSimPinSecure() {
         final IccCardConstants.State simState = mUpdateMonitor.getSimState();
         return (simState == IccCardConstants.State.PIN_REQUIRED
                 || simState == IccCardConstants.State.PUK_REQUIRED
-                || simState == IccCardConstants.State.ABSENT
                 || simState == IccCardConstants.State.PERM_DISABLED);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ private boolean isSimPinSecure() {`
`58`	`58`	`final IccCardConstants.State simState = mUpdateMonitor.getSimState();`
`59`	`59`	`return (simState == IccCardConstants.State.PIN_REQUIRED`
`60`	`60`	`\|\| simState == IccCardConstants.State.PUK_REQUIRED`
`61`		`- \|\| simState == IccCardConstants.State.ABSENT`
`62`	`61`	`\|\| simState == IccCardConstants.State.PERM_DISABLED);`
`63`	`62`	`}`
`64`	`63`