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

Merge "Improve camera launch time from double tap power" into tm-qpr-dev am: 84d0bab4d3

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20271252

Change-Id: I3cb0a0671e62456df8777b929d93e4535d47ed40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arthur Hung
2022-10-26 03:50:25 +00:00
committed by Automerger Merge Worker
parent e1b2ad78d3 84d0bab4d3
commit ccb0dc32f4
1 changed files with 4 additions and 5 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

@@ -4143,6 +4143,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mCameraGestureTriggered = true; mCameraGestureTriggered = true;
if (mRequestedOrSleepingDefaultDisplay) { if (mRequestedOrSleepingDefaultDisplay) {
mCameraGestureTriggeredDuringGoingToSleep = true; 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; return true;
} }
@@ -4674,11 +4678,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
mDefaultDisplayRotation.updateOrientationListener(); mDefaultDisplayRotation.updateOrientationListener();
reportScreenStateToVrManager(false); reportScreenStateToVrManager(false);
if (mCameraGestureTriggeredDuringGoingToSleep) {
wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
PowerManager.WAKE_REASON_CAMERA_LAUNCH,
"com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK");
}
} }
} }