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

Commit 8af883d6 authored by Aaron Liu's avatar Aaron Liu Committed by Justin Dunlap
Browse files

Revert "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." 

This reverts commit 09f00472.

Reason for revert: causing a partner bug
Fixes: 295205456
Bug: 222446076
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8df038265475bb062ead9eec1749ee92a0f5eb4e)
Merged-In: Ida11d98117727f63547b096617a4778bea429e22
Change-Id: Ida11d98117727f63547b096617a4778bea429e22
parent 87d745d5

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

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ 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())) {

                        finish = true;

                        eventSubtype = BOUNCER_DISMISS_SIM;