commit 023c48e92bc18f945e652dc334d5798b4c88551b
author Jordan Liu <jminjie@google.com> Wed Sep 26 17:22:24 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 26 17:22:24 2018 -0700
tree 3ce23caad1695ec419247d8e9c67b5882105a3a9
parent 5d63c53071be5152b1e4771a7db17752b20f2c6f
parent 737945fbd551582c9c413a9a98eb4224355c8f6b

Merge "Dismiss SIM lock page after correct SIM" am: eb1d6d91af
am: 737945fbd5

Change-Id: I38e3374723e4e756688eb3572cffc59834924625

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
index 009ba48..03fb9bb 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -340,12 +340,11 @@
                 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())) {
-                        showSecurityScreen(securityMode);
-                    } else {
                         finish = true;
+                    } else {
+                        showSecurityScreen(securityMode);
                     }
                     break;