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

* commit '7f76ff2c933d725a8867414cacfed82ad61aa630':
  Suppress redundant power key presses while turning screen on.
This commit is contained in:
Jeff Brown
2014-10-08 05:12:43 +00:00
committed by Android Git Automerger

View File

@@ -4421,7 +4421,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mPowerKeyTriggered = false;
cancelPendingScreenshotChordAction();
if (interceptPowerKeyUp(canceled || mPendingPowerKeyUpCanceled)) {
powerShortPress(event.getEventTime());
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;