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

Unverified Commit 0b7e9f1d authored by Aaron Liu's avatar Aaron Liu Committed by Kevin F. Haggerty
Browse files

Revert "Dismiss keyguard when simpin auth'd and..." 

Revert submission 22621774-cherrypicker-L22000000959901080:N28400001357657640

Reason for revert: causing a partner bug
Fixes: 295205456
Bug: 222446076

Reverted changes: /q/submissionid:22621774-cherrypicker-L22000000959901080:N28400001357657640
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cdb57ca0a6462cf1d2b3f2469952586138c2cc43)
Merged-In: Icb27b4d897696b4fbb4e4a878751d925f5205dfd
Change-Id: Icb27b4d897696b4fbb4e4a878751d925f5205dfd
parent c332fc52

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

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
                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;