Merge "DO NOT MERGE Dismiss keyguard when simpin auth'd and..." into rvc-dev
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
Reference in New Issue
Block a user