Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 117faced: am 1cc86956: Merge "Fixed an inconsistency when booting up with SIMPIn" into mnc-dev

Browse Source 
* commit '117faced25861b39abac90dc284981efcca811c2':
  Fixed an inconsistency when booting up with SIMPIn
This commit is contained in:
Selim Cinek
2015-06-24 22:39:26 +00:00
committed by Android Git Automerger
parent 2a0295144a 117faced25
commit 43f6e345ed
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
View File

@@ -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;