commit 9132969774c655f35c620a953b711fb55073105a
author Pengquan Meng <mpq@google.com> Thu Oct 12 18:44:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 18:44:39 2017 +0000
tree af484e241637824d3057b300c7ff4c92a32761b7
parent 61fbefbbab67d5431e3957a721454c9fae62ef88
parent edfcd5f6e3d5b49c4e17723133daae840300531e

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

Change-Id: Ie04fd62df6a8ec0552fe7fd8a04f0616abe1d62a

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: