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 | 466d77617ace8380ab8c52ede20790755d8ff092 (patch) | |
tree | 22fbc420b9abe97e8b1ff7727427ab9acf7a5815 /policy/com | |
parent | 8154cd3bbce98e2b3850d47a7d0826e93860506b (diff) | |
download | frameworks_base-466d77617ace8380ab8c52ede20790755d8ff092.zip frameworks_base-466d77617ace8380ab8c52ede20790755d8ff092.tar.gz frameworks_base-466d77617ace8380ab8c52ede20790755d8ff092.tar.bz2 |
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
Diffstat (limited to 'policy/com')
-rw-r--r-- | policy/com/android/internal/policy/impl/LockPatternKeyguardView.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java index 5a32dc8..c1b14c4 100644 --- a/policy/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/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; + } } } |