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

Commit 44a14ef7 authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

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

* commit 'eb7e3d7e':
  Don't dispatch when non-interactive and the display is off.
parents c694ab32 eb7e3d7e

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

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

    }





    private boolean shouldDispatchInputWhenNonInteractive() {

    private boolean shouldDispatchInputWhenNonInteractive() {

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

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

        if (isKeyguardShowingAndNotOccluded() && mDisplay != null

            return false;

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

        }

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

        if (isKeyguardShowingAndNotOccluded()) {

            return true;

            return true;

        }

        }