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

Commit eb1d6d91 authored by Jordan Liu's avatar Jordan Liu Committed by Gerrit Code Review
Browse files

Merge "Dismiss SIM lock page after correct SIM"

parents b839befd b4299d92

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

+3 −4
Original line number Diff line number Diff line
@@ -342,12 +342,11 @@ 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(targetUserId);

                    if (securityMode != SecurityMode.None

                            || !mLockPatternUtils.isLockScreenDisabled(

                    if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(

                            KeyguardUpdateMonitor.getCurrentUser())) {

                        showSecurityScreen(securityMode);

                    } else {

                        finish = true;

                    } else {

                        showSecurityScreen(securityMode);

                    }

                    break;