From bd38ec6028e318e574652620d00949e24fb9bedf Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Mon, 17 Oct 2022 07:35:39 +0000
Subject: [PATCH] Improve camera launch time from double tap power

Wake the device up early when camera gesture is triggered and device is
going to sleep, this could speed up finishing going to sleep state and
prevent the display doing redundant turning off/on stuff when launching
camera.

Bug: 195788686
Bug: 251700246
Test: double tap power to trigger camera
Change-Id: I99355b870d0c13335d719364a45f66cba31abb86
(cherry picked from commit 0261007810483c45a3b5cb70dfb86b0776e24f77)
Merged-In: I99355b870d0c13335d719364a45f66cba31abb86
Merged-In: I4533e0eecdc31861263e27af164b0a04b926e252
---
 .../com/android/server/policy/PhoneWindowManager.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 32ef014bbad73..579fb489a327f 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4125,6 +4125,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         mCameraGestureTriggered = true;
         if (mRequestedOrSleepingDefaultDisplay) {
             mCameraGestureTriggeredDuringGoingToSleep = true;
+            // Wake device up early to prevent display doing redundant turning off/on stuff.
+            wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
+                    PowerManager.WAKE_REASON_CAMERA_LAUNCH,
+                    "android.policy:CAMERA_GESTURE_PREVENT_LOCK");
         }
         return true;
     }
@@ -4656,11 +4660,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             }
             mDefaultDisplayRotation.updateOrientationListener();
             reportScreenStateToVrManager(false);
-            if (mCameraGestureTriggeredDuringGoingToSleep) {
-                wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
-                        PowerManager.WAKE_REASON_CAMERA_LAUNCH,
-                        "com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK");
-            }
         }
     }