diff options
| author | John Wang <johnwang@google.com> | 2011-07-14 14:03:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-14 14:03:11 -0700 |
| commit | 5f81f1bcd9cdb15411bd4bb036b75ee6e822b8bf (patch) | |
| tree | 8b2f4bd7f2834202c88ac8664144cf04b8f9d655 /policy | |
| parent | 901e022c0c0923867e60c681f70412cfe6179e60 (diff) | |
| parent | 74c425d3e95ed0f47b1a5d447007886d01d7ff56 (diff) | |
| download | frameworks_base-5f81f1bcd9cdb15411bd4bb036b75ee6e822b8bf.zip frameworks_base-5f81f1bcd9cdb15411bd4bb036b75ee6e822b8bf.tar.gz frameworks_base-5f81f1bcd9cdb15411bd4bb036b75ee6e822b8bf.tar.bz2 | |
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.
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 8ba235b..935f4ad 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()) { |