Merge "Watchdog and sluggishness due to multiple virtual displays created by third party apps"
This commit is contained in:
@@ -199,7 +199,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);
|
||||
|
||||
Reference in New Issue
Block a user