commit 98eb4a23b58c83cc705c71d80bcf52494bb44487
author Pengquan Meng <mpq@google.com> Thu Oct 12 18:26:47 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 18:26:47 2017 +0000
tree 975b8b4a2c0addc5168edf8f389e250ec3d42063
parent bad318fc935e953323dcce43e1a5939f8c9cbc6c
parent 00644ec5ccec7e3bed01d0585a0130067bbd9648

Merge "MSIM: Fix to show PUK view when two sims locked on PIN."
am: 00644ec5cc

Change-Id: Ic0b0927a52f2734cccff6f977aa0dfe9cd6e8d5c

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

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
index 7baa57e..0cb6423 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityModel.java
@@ -57,16 +57,16 @@
     SecurityMode getSecurityMode(int userId) {
         KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext);
 
-        if (SubscriptionManager.isValidSubscriptionId(
-                monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
-            return SecurityMode.SimPin;
-        }
-
         if (mIsPukScreenAvailable && SubscriptionManager.isValidSubscriptionId(
                 monitor.getNextSubIdForState(IccCardConstants.State.PUK_REQUIRED))) {
             return SecurityMode.SimPuk;
         }
 
+        if (SubscriptionManager.isValidSubscriptionId(
+                monitor.getNextSubIdForState(IccCardConstants.State.PIN_REQUIRED))) {
+            return SecurityMode.SimPin;
+        }
+
         final int security = mLockPatternUtils.getActivePasswordQuality(userId);
         switch (security) {
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: