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

Commit 0dd9b39a authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Skip transition if the display has no visible content" into main

parents a2073989 e6942eab

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

+2 −0
Original line number Diff line number Diff line
@@ -113,8 +113,10 @@ public class DeferredDisplayUpdater implements DisplayUpdater { 


        // Apply whole display info immediately as is if either:

        // * it is the first display update

        // * the display doesn't have visible content

        // * shell transitions are disabled or temporary unavailable

        if (displayInfoDiff == DIFF_EVERYTHING

                || !mDisplayContent.getLastHasContent()

                || !mDisplayContent.mTransitionController.isShellTransitionsEnabled()) {

            ProtoLog.d(WM_DEBUG_WINDOW_TRANSITIONS,

                    "DeferredDisplayUpdater: applying DisplayInfo immediately");

services/tests/wmtests/src/com/android/server/wm/DisplayContentDeferredUpdateTests.java

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public class DisplayContentDeferredUpdateTests extends WindowTestsBase { 


    @Before

    public void before() {

        doReturn(true).when(mDisplayContent).getLastHasContent();

        mockTransitionsController(/* enabled= */ true);

        mockRemoteDisplayChangeController();

    }