Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edfcd5f6 authored by Pengquan Meng's avatar Pengquan Meng Committed by android-build-merger
Browse files

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

am: 98eb4a23

Change-Id: I51e91e8cd3668d78d84c101848c02d6d99ea29c5
parents dc2917fb 98eb4a23

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

+5 −5
Original line number Diff line number Diff line
@@ -57,16 +57,16 @@ public class KeyguardSecurityModel { 
    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: