diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-01 00:47:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-01 00:47:44 -0700 |
| commit | 1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea (patch) | |
| tree | 3f19510640f9cc5081bd737c21cccd46bc96c787 /policy/src | |
| parent | 4b6353ea0265bfed52d0637abd1b17596ce25ff0 (diff) | |
| parent | 9fa1ada318ad9be0b43951b9d3c107b4e0bf345c (diff) | |
| download | frameworks_base-1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea.zip frameworks_base-1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea.tar.gz frameworks_base-1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea.tar.bz2 | |
Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
Diffstat (limited to 'policy/src')
| -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; } |