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

Commit 8b988e72 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't reset the keyguard if it's going away." into sc-v2-dev

parents 4b3ea38f 757317e2

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −1
Original line number Diff line number Diff line
@@ -1025,7 +1025,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                if (!mExternallyEnabled) {

                    hideLocked();

                }

            } else if (mShowing) {

            } else if (mShowing && !mKeyguardStateController.isKeyguardGoingAway()) {

                // If we are going to sleep but the keyguard is showing (and will continue to be

                // showing, not in the process of going away) then reset its state. Otherwise, let

                // this fall through and explicitly re-lock the keyguard.

                mPendingReset = true;

            } else if (

                    (offReason == WindowManagerPolicyConstants.OFF_BECAUSE_OF_TIMEOUT