am 74c425d3: am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE

* commit '74c425d3e95ed0f47b1a5d447007886d01d7ff56':
  Show SIM blocked after 10 time puk wrong entries.

1 files changed, 12 insertions, 4 deletions

diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
index 8ba235b3afe3..935f4ad0cb6d 100644
--- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -689,13 +689,11 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
 
         switch (simState) {
             case ABSENT:
-            case PERM_DISABLED:
                 // only force lock screen in case of missing sim if user hasn't
                 // gone through setup wizard
                 if (!mUpdateMonitor.isDeviceProvisioned()) {
                     if (!isShowing()) {
-                        if (DEBUG) Log.d(TAG, "INTENT_VALUE_ICC_ABSENT "
-                                + "or PERM_DISABLED and keygaurd isn't showing,"
+                        if (DEBUG) Log.d(TAG, "ICC_ABSENT isn't showing,"
                                 + " we need to show the keyguard since the "
                                 + "device isn't provisioned yet.");
                         doKeyguard();
@@ -713,7 +711,17 @@ public class KeyguardViewMediator implements KeyguardViewCallback,
                 } else {
                     resetStateLocked();
                 }
-
+                break;
+            case PERM_DISABLED:
+                if (!isShowing()) {
+                    if (DEBUG) Log.d(TAG, "PERM_DISABLED and "
+                          + "keygaurd isn't showing.");
+                    doKeyguard();
+                } else {
+                    if (DEBUG) Log.d(TAG, "PERM_DISABLED, resetStateLocked to"
+                          + "show permanently disabled message in lockscreen.");
+                    resetStateLocked();
+                }
                 break;
             case READY:
                 if (isShowing()) {