diff options
author | Jim Miller <jaggies@google.com> | 2010-03-29 19:31:26 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2010-03-29 19:31:26 -0700 |
commit | 876b0644770d1790b21e4049bc7f40851045dc86 (patch) | |
tree | 180e95023d00a850784101bfe6a0dfd8e32b976a | |
parent | 71836f4cb6389042d839d2a26582f796c6e97c26 (diff) | |
download | base-876b0644770d1790b21e4049bc7f40851045dc86.tar.gz |
Fix 2555028: Restore showing tab unlock before PIN & password entry.
This fixes a bug introduced in change 46594 that prevents showing
the tab unlock screen before PIN & password entry.
Change-Id: Ibd603921f6a22b603652c4751fa0f2f7d9129bb2
-rw-r--r-- | phone/com/android/internal/policy/impl/LockPatternKeyguardView.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java b/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java index 5a32dc8..c1b14c4 100644 --- a/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/phone/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -640,10 +640,15 @@ public class LockPatternKeyguardView extends KeyguardViewBase { final IccCard.State simState = mUpdateMonitor.getSimState(); if (stuckOnLockScreenBecauseSimMissing() || (simState == IccCard.State.PUK_REQUIRED)) { return Mode.LockScreen; - } else if (isSecure()) { - return Mode.UnlockScreen; } else { - return Mode.LockScreen; + // Show LockScreen first for any screen other than Pattern unlock. + final boolean usingLockPattern = mLockPatternUtils.getKeyguardStoredPasswordQuality() + == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; + if (isSecure() && usingLockPattern) { + return Mode.UnlockScreen; + } else { + return Mode.LockScreen; + } } } |