diff options
| author | 2023-01-06 23:44:06 +0000 | |
|---|---|---|
| committer | 2023-01-06 23:44:06 +0000 | |
| commit | 160d17474f9a6b7f0e18c02a38b46522f7e1f527 (patch) | |
| tree | 57a9a5c04fafd13da64091d4b483480b861a16f1 | |
| parent | 75e703a7bdd3d8e538fd3810bc0a48313199c8a6 (diff) | |
| parent | c956023fe65b8deaf126b14aafa8541572b0a404 (diff) | |
Merge "Ignore power presses from lift and biometric wake" into tm-qpr-dev am: c956023fe6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20886542
Change-Id: Ic4c4dc78892d06a5f9c1ebcfaae643636786c7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/view/WindowManagerPolicyConstants.java | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/view/WindowManagerPolicyConstants.java b/core/java/android/view/WindowManagerPolicyConstants.java index 43d427db2c75..4c49f2c049ee 100644 --- a/core/java/android/view/WindowManagerPolicyConstants.java +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -169,6 +169,9 @@ public interface WindowManagerPolicyConstants { case PowerManager.WAKE_REASON_POWER_BUTTON: case PowerManager.WAKE_REASON_PLUGGED_IN: 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_WAKE_KEY: case PowerManager.WAKE_REASON_WAKE_MOTION: diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 20df90347453..c8a11a529c30 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1079,10 +1079,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { // 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. final PowerManager.WakeData lastWakeUp = mPowerManagerInternal.getLastWakeup(); - if (lastWakeUp != null && lastWakeUp.wakeReason == PowerManager.WAKE_REASON_GESTURE) { - final int gestureDelayMillis = Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.POWER_BUTTON_SUPPRESSION_DELAY_AFTER_GESTURE_WAKE, - POWER_BUTTON_SUPPRESSION_DELAY_DEFAULT_MILLIS); + if (lastWakeUp != null && (lastWakeUp.wakeReason == PowerManager.WAKE_REASON_GESTURE + || lastWakeUp.wakeReason == PowerManager.WAKE_REASON_LIFT + || lastWakeUp.wakeReason == PowerManager.WAKE_REASON_BIOMETRIC)) { final long now = SystemClock.uptimeMillis(); if (mPowerButtonSuppressionDelayMillis > 0 && (now < lastWakeUp.wakeTime + mPowerButtonSuppressionDelayMillis)) { |