diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-01 07:49:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 07:49:46 +0000 |
| commit | 2272602032e5051d5067a7a95c741304468a81af (patch) | |
| tree | 14d7e762a26c85a142cca9383d14b98317bd5abd /policy | |
| parent | 11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3 (diff) | |
| parent | 1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea (diff) | |
| download | frameworks_base-2272602032e5051d5067a7a95c741304468a81af.zip frameworks_base-2272602032e5051d5067a7a95c741304468a81af.tar.gz frameworks_base-2272602032e5051d5067a7a95c741304468a81af.tar.bz2 | |
am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
Fix 5497305: Make sure we show SIM unlock when "None" is selected
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index 0471dfe..c802bc1 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -616,8 +616,8 @@ public class KeyguardViewMediator implements KeyguardViewCallback, final IccCard.State state = mUpdateMonitor.getSimState(); final boolean lockedOrMissing = state.isPinLocked() || ((state == IccCard.State.ABSENT - || state == IccCard.State.PERM_DISABLED) - && requireSim); + || state == IccCard.State.PERM_DISABLED) + && requireSim); if (!lockedOrMissing && !provisioned) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because device isn't provisioned" @@ -625,7 +625,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, return; } - if (mLockPatternUtils.isLockScreenDisabled()) { + if (mLockPatternUtils.isLockScreenDisabled() && !lockedOrMissing) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off"); return; } |