summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jordan Liu <jminjie@google.com> 2019-07-15 17:05:20 -0700
committer Jordan Liu <jminjie@google.com> 2019-07-16 15:02:32 -0700
commit0be0b9b75d90846963897888966076eab0d27496 (patch)
tree743c0fe1d3813aea84c5c18cb38f45ac5d3e7d96
parent79a2b5215d363cd7ea80660c5f27cefceec92426 (diff)
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)
-rw-r--r--packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index 03fb9bbdbd4e..0fcb99445a44 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 {