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

Commit 20e330dc authored by William Leshner's avatar William Leshner Committed by Android (Google) Code Review
Browse files

Merge "Do not go to dream on power button press when screen is off." into tm-qpr-dev

parents f8832235 12a548ad

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

+1 −6
Original line number Diff line number Diff line
@@ -975,12 +975,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            powerMultiPressAction(eventTime, interactive, mTriplePressOnPowerBehavior);

        } else if (count > 3 && count <= getMaxMultiPressPowerCount()) {

            Slog.d(TAG, "No behavior defined for power press count " + count);

        } else if (count == 1 && interactive) {

            if (beganFromNonInteractive) {

                // The screen off case, where we might want to start dreaming on power button press.

                attemptToDreamFromShortPowerButtonPress(false, () -> {});

                return;

            }

        } else if (count == 1 && interactive && !beganFromNonInteractive) {

            if (mSideFpsEventHandler.shouldConsumeSinglePress(eventTime)) {

                Slog.i(TAG, "Suppressing power key because the user is interacting with the "

                        + "fingerprint sensor");