From 0261007810483c45a3b5cb70dfb86b0776e24f77 Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Mon, 17 Oct 2022 07:35:39 +0000
Subject: [PATCH] Remove redundant wake up while launching camera

Remove wake up code from `screenTurnedOff` for we alreay wake
up device when the camera gesture has been detected,

Bug: 251700246
Test: double tap power to trigger camera
Change-Id: I99355b870d0c13335d719364a45f66cba31abb86
---
 .../com/android/server/policy/PhoneWindowManager.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index ae998067fa039..0364f82b224b0 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -4195,7 +4195,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         if (mRequestedOrSleepingDefaultDisplay) {
             mCameraGestureTriggeredDuringGoingToSleep = true;
             // Wake device up early to prevent display doing redundant turning off/on stuff.
-            wakeUpFromPowerKey(event.getDownTime());
+            wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
+                    PowerManager.WAKE_REASON_CAMERA_LAUNCH,
+                    "android.policy:CAMERA_GESTURE_PREVENT_LOCK");
         }
         return true;
     }
@@ -4728,11 +4730,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");
-            }
         }
     }