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

Commit 2b381768 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev

parents 7d8fd7a9 09f00472

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -726,7 +726,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
                case SimPuk:

                case SimPuk:

                    // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home

                    // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home

                    SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

                    SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);

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

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

                            KeyguardUpdateMonitor.getCurrentUser())) {

                            KeyguardUpdateMonitor.getCurrentUser())) {

                        finish = true;

                        finish = true;

                        eventSubtype = BOUNCER_DISMISS_SIM;

                        eventSubtype = BOUNCER_DISMISS_SIM;