Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 952abf42 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 43f6e345: am 117faced: am 1cc86956: Merge "Fixed an inconsistency when... 

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

* commit '43f6e345':
  Fixed an inconsistency when booting up with SIMPIn
parents 5433f5f8 43f6e345

packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java

+3 −1
Original line number Diff line number Diff line
@@ -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;