summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Liu <jminjie@google.com>2019-07-16 00:05:20 (GMT)
committerLuca Stefani <luca.stefani.ge1@gmail.com>2019-07-27 20:57:46 (GMT)
commit4d12c537ca94a412e79af2de7483c792542a6879 (patch)
tree34159f1abf89f69d7779e8c2bc1da1a5a47806b4
parent23042d81e4d490692f7dba1963a4423524ee16bc (diff)
downloadframeworks_base-4d12c537ca94a412e79af2de7483c792542a6879.zip
frameworks_base-4d12c537ca94a412e79af2de7483c792542a6879.tar.gz
frameworks_base-4d12c537ca94a412e79af2de7483c792542a6879.tar.bz2
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 0f9f278..9c69432 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 {