diff options
| author | John Wang <johnwang@google.com> | 2011-07-14 14:00:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-14 14:00:58 -0700 |
| commit | 74c425d3e95ed0f47b1a5d447007886d01d7ff56 (patch) | |
| tree | 198129782c4d974dd292a7951488eb35e899044a /policy | |
| parent | 3810361e4a3e93d3c8a10aaeec54f65dfcc2d03d (diff) | |
| parent | 54b2a3262738cdb3d0df747d8719e9a3cac33dfc (diff) | |
| download | frameworks_base-74c425d3e95ed0f47b1a5d447007886d01d7ff56.zip frameworks_base-74c425d3e95ed0f47b1a5d447007886d01d7ff56.tar.gz frameworks_base-74c425d3e95ed0f47b1a5d447007886d01d7ff56.tar.bz2 | |
am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
Show SIM blocked after 10 time puk wrong entries.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 16 |
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 cfd0d4f..abc3598 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -690,13 +690,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(); @@ -714,7 +712,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()) { |