[automerge] Dismiss keyguard when simpin auth'd and... 2p: 65ea56f54c

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

Bug: 222446076
Change-Id: I4d20ae6ef3b38fea55f0f331ae50f5f786e458b6
Merged-In: Ib2d5400e930fa4d6f7f98e46f32a290ba5f558f4
This commit is contained in:
Presubmit Automerger Backend
2023-04-17 18:59:46 +00:00

View File

@@ -391,7 +391,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;