From 245273ec8dd33f10f2682f140057ea0e5b270ef8 Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Wed, 24 Jun 2015 13:17:56 -0400
Subject: [PATCH] Fixed an inconsistency when booting up with SIMPIn

The lockscreen was skipped when the security mode was
swipe, which is inconsistent with the normal bootup
behavior.

Bug: 21850021
Change-Id: I2c59b1428d489fad566097771ca449ba667f34d2
---
 .../src/com/android/keyguard/KeyguardSecurityContainer.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
index f529ac0f3497f..23bd238f559eb 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -329,7 +329,9 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
                 case SimPuk:
                     // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
                     SecurityMode securityMode = mSecurityModel.getSecurityMode();
-                    if (securityMode != SecurityMode.None) {
+                    if (securityMode != SecurityMode.None
+                            || !mLockPatternUtils.isLockScreenDisabled(
+                            KeyguardUpdateMonitor.getCurrentUser())) {
                         showSecurityScreen(securityMode);
                     } else {
                         finish = true;