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

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

Browse Source
This commit is contained in:
William Leshner
2023-01-25 00:38:28 +00:00
committed by Android (Google) Code Review
parent f8832235db 12a548ad4b
commit 20e330dc28
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -975,12 +975,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
powerMultiPressAction(eventTime, interactive, mTriplePressOnPowerBehavior); powerMultiPressAction(eventTime, interactive, mTriplePressOnPowerBehavior);
} else if (count > 3 && count <= getMaxMultiPressPowerCount()) { } else if (count > 3 && count <= getMaxMultiPressPowerCount()) {
Slog.d(TAG, "No behavior defined for power press count " + count); Slog.d(TAG, "No behavior defined for power press count " + count);
} else if (count == 1 && interactive) { } else if (count == 1 && interactive && !beganFromNonInteractive) {
if (beganFromNonInteractive) {
// The screen off case, where we might want to start dreaming on power button press.
attemptToDreamFromShortPowerButtonPress(false, () -> {});
return;
}
if (mSideFpsEventHandler.shouldConsumeSinglePress(eventTime)) { if (mSideFpsEventHandler.shouldConsumeSinglePress(eventTime)) {
Slog.i(TAG, "Suppressing power key because the user is interacting with the " Slog.i(TAG, "Suppressing power key because the user is interacting with the "
+ "fingerprint sensor"); + "fingerprint sensor");