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

Commit 8ba76383 authored by Aaron Liu's avatar Aaron Liu Committed by Justin Dunlap
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:b0a8e4160580901ffee222e8874e8cdc108a8ec0)
Merged-In: Icb27b4d897696b4fbb4e4a878751d925f5205dfd
Change-Id: Icb27b4d897696b4fbb4e4a878751d925f5205dfd
parent 970e8cc3

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;