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

Commit f6478d4c authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Correctly forwarding the screen off event on lockscreen" into lmp-dev

parents 7632a807 7ff6eb64

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

+2 −1
Original line number Diff line number Diff line
@@ -581,6 +581,8 @@ public class KeyguardViewMediator extends SystemUI { 
            final boolean lockImmediately =

                mLockPatternUtils.getPowerButtonInstantlyLocks() || !mLockPatternUtils.isSecure();



            notifyScreenOffLocked();



            if (mExitSecureCallback != null) {

                if (DEBUG) Log.d(TAG, "pending exit secure callback cancelled");

                try {
@@ -593,7 +595,6 @@ public class KeyguardViewMediator extends SystemUI { 
                    hideLocked();

                }

            } else if (mShowing) {

                notifyScreenOffLocked();

                resetStateLocked();

            } else if (why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT

                   || (why == WindowManagerPolicy.OFF_BECAUSE_OF_USER && !lockImmediately)) {