diff options
| author | 2023-01-07 00:19:44 +0000 | |
|---|---|---|
| committer | 2023-01-07 00:19:44 +0000 | |
| commit | b3bdf6589d11cffc60d593f616e4e772ebb243cc (patch) | |
| tree | 62b6db7328172e9d5674b51c9411b6ceb6ef7d53 | |
| parent | e201acead6ad18d046c89988175fd7b9cee47d28 (diff) | |
| parent | 160d17474f9a6b7f0e18c02a38b46522f7e1f527 (diff) | |
Merge "Ignore power presses from lift and biometric wake" into tm-qpr-dev am: c956023fe6 am: 160d17474f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20886542
Change-Id: I6579925211c1d249bdcec5914994b301adbcb6a1
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 9472d8615612..afc567e5de5c 100644 --- a/core/java/android/view/WindowManagerPolicyConstants.java +++ b/core/java/android/view/WindowManagerPolicyConstants.java @@ -162,6 +162,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 ae24ff206e7a..a53d0f9e3c7a 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1095,10 +1095,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)) { |