diff options
| author | Selim Cinek <cinek@google.com> | 2015-06-24 22:19:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 22:20:00 +0000 |
| commit | 1cc869561e6615bf8c473cdf5dfc8773e4c839e5 (patch) | |
| tree | 8e277d28a7adf29f75c755fe86433189fd3e5088 /packages | |
| parent | 3b9fbd2f2de75e53a836d3cb73bcfc25fdb3a67a (diff) | |
| parent | 245273ec8dd33f10f2682f140057ea0e5b270ef8 (diff) | |
| download | frameworks_base-1cc869561e6615bf8c473cdf5dfc8773e4c839e5.zip frameworks_base-1cc869561e6615bf8c473cdf5dfc8773e4c839e5.tar.gz frameworks_base-1cc869561e6615bf8c473cdf5dfc8773e4c839e5.tar.bz2 | |
Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev
Diffstat (limited to 'packages')
| -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; |