DO NOT MERGE Dismiss keyguard when simpin auth'd and... am: 09f0047222

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

Change-Id: Ib65c3b8759581e04f6bdfa3dfed49a467ef846e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2023-04-19 18:18:24 +00:00
committed by Automerger Merge Worker

View File

@@ -726,7 +726,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
case SimPuk: case SimPuk:
// Shortcut for SIM PIN/PUK to go to directly to user's security screen or home // Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId); SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled( if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(
KeyguardUpdateMonitor.getCurrentUser())) { KeyguardUpdateMonitor.getCurrentUser())) {
finish = true; finish = true;
eventSubtype = BOUNCER_DISMISS_SIM; eventSubtype = BOUNCER_DISMISS_SIM;