Merge "Fix sim pin on DSDS" am: 268b4a3ad4

am: fb8ca75270

Change-Id: Ic24cab8c9c8588c7d950bce3b7f8371a31047eb8
This commit is contained in:
Jordan Liu
2019-07-19 05:08:14 -07:00
committed by android-build-merger

View File

@@ -508,7 +508,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
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;