diff options
| author | Jim Miller <jaggies@google.com> | 2010-03-30 18:20:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-30 18:20:03 -0700 |
| commit | fc8686b9ec61fe48cc678cc08979d91b5fd4d225 (patch) | |
| tree | f11e1a1b9ae0c99cd6297f779a4fd44dde8a397c /policy | |
| parent | 7836b05105ab2c8cd945b63ccebb2373396ad5b2 (diff) | |
| parent | 466d77617ace8380ab8c52ede20790755d8ff092 (diff) | |
| download | frameworks_base-fc8686b9ec61fe48cc678cc08979d91b5fd4d225.zip frameworks_base-fc8686b9ec61fe48cc678cc08979d91b5fd4d225.tar.gz frameworks_base-fc8686b9ec61fe48cc678cc08979d91b5fd4d225.tar.bz2 | |
am 876b0644: Fix 2555028: Restore showing tab unlock before PIN & password entry.
Merge commit '876b0644770d1790b21e4049bc7f40851045dc86' into kraken
* commit '876b0644770d1790b21e4049bc7f40851045dc86':
Fix 2555028: Restore showing tab unlock before PIN & password entry.
Diffstat (limited to 'policy')
| -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; + } } } |