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"

Browse Source
This commit is contained in:
Riddle Hsu
2023-06-26 13:00:57 +00:00
committed by Gerrit Code Review
parent 235498b6e0 d8cdd3ef82
commit 42116a7ed3
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

@@ -199,7 +199,8 @@ class KeyguardController {
// handle the snapshot. // handle the snapshot.
// - The display state is ON. Because if AOD is not on or pulsing, the display state will // - 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). // 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( && !state.mKeyguardGoingAway && Display.isOnState(
mRootWindowContainer.getDefaultDisplay().getDisplayInfo().state)) { mRootWindowContainer.getDefaultDisplay().getDisplayInfo().state)) {
mWindowManager.mTaskSnapshotController.snapshotForSleeping(DEFAULT_DISPLAY); mWindowManager.mTaskSnapshotController.snapshotForSleeping(DEFAULT_DISPLAY);