Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42116a7e authored by Riddle Hsu's avatar Riddle Hsu Committed by Gerrit Code Review
Browse files

Merge "Watchdog and sluggishness due to multiple virtual displays created by third party apps"

parents 235498b6 d8cdd3ef

services/core/java/com/android/server/wm/KeyguardController.java

+2 −1
Original line number Diff line number Diff line
@@ -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);