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

Commit b52e3dd1 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Don't freeze display if it isn't okay to animate." into oc-dr1-dev 

am: 932bc6df

Change-Id: Ie9a892f3e343170043d9683ef233c6fabc22cf03
parents 092bb2fd 932bc6df

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

+3 −3
Original line number Diff line number Diff line
@@ -6003,9 +6003,9 @@ public class WindowManagerService extends IWindowManager.Stub 
            return;

        }



        if (!displayContent.isReady() || !mPolicy.isScreenOn()) {

            // No need to freeze the screen before the display is ready, system is ready, or if

            // the screen is off.

        if (!displayContent.isReady() || !mPolicy.isScreenOn() || !okToAnimate()) {

            // No need to freeze the screen before the display is ready,  if the screen is off,

            // or we can't currently animate.

            return;

        }