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

Commit eb7e3d7e authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Don't dispatch when non-interactive and the display is off." into mnc-dev

parents a3b5a612 2ccf0c8e

services/core/java/com/android/server/policy/PhoneWindowManager.java

+5 −3
Original line number Diff line number Diff line
@@ -5229,9 +5229,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private boolean shouldDispatchInputWhenNonInteractive() {

        // Send events to keyguard while the screen is on.

        if (isKeyguardShowingAndNotOccluded() && mDisplay != null

                && mDisplay.getState() != Display.STATE_OFF) {

        if (mDisplay == null || mDisplay.getState() == Display.STATE_OFF) {

            return false;

        }

        // Send events to keyguard while the screen is on and it's showing.

        if (isKeyguardShowingAndNotOccluded()) {

            return true;

        }