diff options
| author | Selim Cinek <cinek@google.com> | 2015-06-24 13:17:56 -0400 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2015-06-24 13:17:56 -0400 |
| commit | 245273ec8dd33f10f2682f140057ea0e5b270ef8 (patch) | |
| tree | 13741593a3d20d7722e4d7e6c01a8f7c9e20f3ef /packages/Keyguard/src/com | |
| parent | edd32b881780e52b4ecc43f8df3b6b091e70a863 (diff) | |
| download | frameworks_base-245273ec8dd33f10f2682f140057ea0e5b270ef8.zip frameworks_base-245273ec8dd33f10f2682f140057ea0e5b270ef8.tar.gz frameworks_base-245273ec8dd33f10f2682f140057ea0e5b270ef8.tar.bz2 | |
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
Diffstat (limited to 'packages/Keyguard/src/com')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index f529ac0..23bd238 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; |