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

Commit fc8686b9 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am 876b0644: Fix 2555028: Restore showing tab unlock before PIN & password entry. 

Merge commit '876b0644770d1790b21e4049bc7f40851045dc86' into kraken

* commit '876b0644770d1790b21e4049bc7f40851045dc86':
  Fix 2555028: Restore showing tab unlock before PIN & password entry.
parents 7836b051 466d7761

policy/com/android/internal/policy/impl/LockPatternKeyguardView.java

+8 −3
Original line number Diff line number Diff line
@@ -640,12 +640,17 @@ public class LockPatternKeyguardView extends KeyguardViewBase { 
        final IccCard.State simState = mUpdateMonitor.getSimState();

        if (stuckOnLockScreenBecauseSimMissing() || (simState == IccCard.State.PUK_REQUIRED)) {

            return Mode.LockScreen;

        } else if (isSecure()) {

        } else {

            // Show LockScreen first for any screen other than Pattern unlock.

            final boolean usingLockPattern = mLockPatternUtils.getKeyguardStoredPasswordQuality()

                    == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;

            if (isSecure() && usingLockPattern) {

                return Mode.UnlockScreen;

            } else {

                return Mode.LockScreen;

            }

        }

    }



    /**

     * Given the current state of things, what should the unlock screen be?