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

Merge "Watchdog and sluggishness due to multiple virtual displays created by third party apps" am: 42116a7ed3 am: 10054ca8cd

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

Change-Id: I3d10ebe7156656a0b52243489c45377725b40b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-06-26 13:48:16 +00:00
committed by Automerger Merge Worker
parent 007140c697 10054ca8cd
commit 6914406050
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/KeyguardController.java
View File

@@ -200,7 +200,8 @@ class KeyguardController {
// handle the snapshot.
// - The display state is ON. Because if AOD is not on or pulsing, the display state will
// be OFF or DOZE (the path of screen off may have handled it).
if (((aodShowing ^ keyguardShowing) || (aodShowing && aodChanged && keyguardChanged))
if (displayId == DEFAULT_DISPLAY
&& ((aodShowing ^ keyguardShowing) || (aodShowing && aodChanged && keyguardChanged))
&& !state.mKeyguardGoingAway && Display.isOnState(
mRootWindowContainer.getDefaultDisplay().getDisplayInfo().state)) {
mWindowManager.mTaskSnapshotController.snapshotForSleeping(DEFAULT_DISPLAY);