diff options
-rw-r--r-- | policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java index 8e7a276..7f79cc2 100644 --- a/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java +++ b/policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java @@ -775,12 +775,9 @@ public class LockPatternKeyguardView extends KeyguardViewBase { if (stuckOnLockScreenBecauseSimMissing() || (simState == IccCard.State.PUK_REQUIRED)) { return Mode.LockScreen; } else { - // Show LockScreen first for any screen other than Pattern unlock and Finger unlock. - final boolean usingLockPattern = mLockPatternUtils.getKeyguardStoredPasswordQuality() - == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; - final boolean usingLockFinger = mLockPatternUtils.getKeyguardStoredPasswordQuality() - == DevicePolicyManager.PASSWORD_QUALITY_FINGER; - if (mLockscreenDisableOnSecurity && isSecure() && (usingLockPattern || usingLockFinger) || (simState == IccCard.State.PIN_REQUIRED)) { + // Disable LockScreen if security lockscreen is active and option in CMParts set + // Also don't show the slider lockscreen if pin is required + if (mLockscreenDisableOnSecurity && isSecure() || (simState == IccCard.State.PIN_REQUIRED)) { return Mode.UnlockScreen; } else { return Mode.LockScreen; |