Merge "Do not go to dream on power button press when screen is off." (df3ea99f) · Commits · e / os / android_frameworks_base

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

+1 −8

Original line number	Original line	Diff line number	Diff line
	@@ -991,14 +991,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 is 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");