Merge "Dismiss SIM lock page after correct SIM"

am: eb1d6d91af Change-Id: I01551d9d8e14e7a9bd4ef5178b571beee032735b
2018-09-26 17:09:44 -07:00
parent 47be78e523 eb1d6d91af
commit 737945fbd5
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
@@ -342,12 +342,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;