Merge "Fix sim pin on DSDS"

am: 268b4a3ad4

Change-Id: I4bb53f6ac3e7302f60a922d7a4349ac9df601d7e
This commit is contained in:
Jordan Liu
2019-07-19 04:51:49 -07:00
committed by android-build-merger

View File

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