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

am: 737945fbd5 Change-Id: I38e3374723e4e756688eb3572cffc59834924625
2018-09-26 17:22:24 -07:00
parent 5d63c53071 737945fbd5
commit 023c48e92b
1 changed files with 3 additions and 4 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -340,12 +340,11 @@ 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())) {
-                        showSecurityScreen(securityMode);
-                    } else {
                        finish = true;
+                    } else {
+                        showSecurityScreen(securityMode);
                    }
                    break;