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

Merge "Ignore power presses from lift and biometric wake" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-01-06 23:16:48 +00:00
committed by Android (Google) Code Review
parent 6651ac5100 c1e2804be1
commit c956023fe6
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/WindowManagerPolicyConstants.java
View File

@@ -169,6 +169,9 @@ public interface WindowManagerPolicyConstants {
case PowerManager.WAKE_REASON_POWER_BUTTON: case PowerManager.WAKE_REASON_POWER_BUTTON:
case PowerManager.WAKE_REASON_PLUGGED_IN: case PowerManager.WAKE_REASON_PLUGGED_IN:
case PowerManager.WAKE_REASON_GESTURE: case PowerManager.WAKE_REASON_GESTURE:
case PowerManager.WAKE_REASON_TAP:
case PowerManager.WAKE_REASON_LIFT:
case PowerManager.WAKE_REASON_BIOMETRIC:
case PowerManager.WAKE_REASON_CAMERA_LAUNCH: case PowerManager.WAKE_REASON_CAMERA_LAUNCH:
case PowerManager.WAKE_REASON_WAKE_KEY: case PowerManager.WAKE_REASON_WAKE_KEY:
case PowerManager.WAKE_REASON_WAKE_MOTION: case PowerManager.WAKE_REASON_WAKE_MOTION:

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

@@ -1077,10 +1077,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// a tendency to hit the power button immediately when they pick up their device, and we // a tendency to hit the power button immediately when they pick up their device, and we
// don't want to put the device back to sleep in those cases. // don't want to put the device back to sleep in those cases.
final PowerManager.WakeData lastWakeUp = mPowerManagerInternal.getLastWakeup(); final PowerManager.WakeData lastWakeUp = mPowerManagerInternal.getLastWakeup();
if (lastWakeUp != null && lastWakeUp.wakeReason == PowerManager.WAKE_REASON_GESTURE) { if (lastWakeUp != null && (lastWakeUp.wakeReason == PowerManager.WAKE_REASON_GESTURE
final int gestureDelayMillis = Settings.Global.getInt(mContext.getContentResolver(), || lastWakeUp.wakeReason == PowerManager.WAKE_REASON_LIFT
Settings.Global.POWER_BUTTON_SUPPRESSION_DELAY_AFTER_GESTURE_WAKE, || lastWakeUp.wakeReason == PowerManager.WAKE_REASON_BIOMETRIC)) {
POWER_BUTTON_SUPPRESSION_DELAY_DEFAULT_MILLIS);
final long now = SystemClock.uptimeMillis(); final long now = SystemClock.uptimeMillis();
if (mPowerButtonSuppressionDelayMillis > 0 if (mPowerButtonSuppressionDelayMillis > 0
&& (now < lastWakeUp.wakeTime + mPowerButtonSuppressionDelayMillis)) { && (now < lastWakeUp.wakeTime + mPowerButtonSuppressionDelayMillis)) {