From 0be0b9b75d90846963897888966076eab0d27496 Mon Sep 17 00:00:00 2001
From: Jordan Liu <jminjie@google.com>
Date: Mon, 15 Jul 2019 17:05:20 -0700
Subject: [PATCH] Fix sim pin on DSDS

Fixes the issue where only one SIM's PIN is checked when unlocking.

Test: manual
Bug: 135496265
Merged-In: I8db4565c4e5d5bcfb166b5962e878531a84dbafb
Change-Id: I8db4565c4e5d5bcfb166b5962e878531a84dbafb
(cherry picked from commit 560fe75f696c262fbe12985fe379c1b0868f348c)
---
 .../src/com/android/keyguard/KeyguardSecurityContainer.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index 03fb9bbdbd4ee..0fcb99445a440 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -340,7 +340,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;
                     } else {