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

Commit cf8dcd28 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640"... 

Merge changes from topic "cherrypicker-L22000000959901080:N28400001357657640" into sc-qpr1-dev am: 7fdc711c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22621774



Change-Id: I330bf78b2ca6b7947f2fd7cd138afd98001fdde6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 647716eb 7fdc711c

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;