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

Commit 71747669 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 662034f1: am 7f76ff2c: Merge "Suppress redundant power key presses while... 

am 662034f1: am 7f76ff2c: Merge "Suppress redundant power key presses while turning screen on." into lmp-dev

* commit '662034f1':
  Suppress redundant power key presses while turning screen on.
parents a09ae911 662034f1

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+6 −1
Original line number Diff line number Diff line
@@ -4421,7 +4421,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mPowerKeyTriggered = false;

                    cancelPendingScreenshotChordAction();

                    if (interceptPowerKeyUp(canceled || mPendingPowerKeyUpCanceled)) {

                        if (mScreenOnEarly && !mScreenOnFully) {

                            Slog.i(TAG, "Suppressed redundant power key press while "

                                    + "already in the process of turning the screen on.");

                        } else {

                            powerShortPress(event.getEventTime());

                        }

                        isWakeKey = false;

                    }

                    mPendingPowerKeyUpCanceled = false;