Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7174766951ebccebb2c77d88725b5cae6c3828c8':
  Suppress redundant power key presses while turning screen on.
This commit is contained in:
Jeff Brown
2014-10-08 05:35:41 +00:00
committed by Android Git Automerger
parent 7ac3ca42b5 7174766951
commit afcd49611e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

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