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

Merge "Remove redundant wake up while launching camera"

Browse Source
This commit is contained in:
Arthur Hung
2022-10-21 15:28:03 +00:00
committed by Android (Google) Code Review
parent a7cc7a5816 0261007810
commit b9ee34937f
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4193,7 +4193,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;
}
@@ -4726,11 +4728,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");
}
}
}