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

Commit 5e3e0d62 authored by William Leshner's avatar William Leshner Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20968963



Change-Id: Ieab3bcbe22c7a837b4d78022d8960e0ef657b004
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb9ff85c 20e330dc

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

+1 −6
Original line number Diff line number Diff line
@@ -977,12 +977,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");