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

Commit 9aa43e63 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev

parents 997f2f71 1f833085

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

+5 −0
Original line number Diff line number Diff line
@@ -2037,6 +2037,11 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (dc == null) {

            return;

        }



        // If layout is currently deferred, we want to hold of with updating the layers.

        if (mService.mWindowPlacerLocked.isLayoutDeferred()) {

            return;

        }

        final DimLayer.DimLayerUser dimLayerUser = getDimLayerUser();

        if (dimLayerUser != null && dc.mDimLayerController.isDimming(dimLayerUser, mWinAnimator)) {

            // Force an animation pass just to update the mDimLayer layer.

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

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ class WindowSurfacePlacer { 
        }

    }



    boolean isLayoutDeferred() {

        return mDeferDepth > 0;

    }



    final void performSurfacePlacement() {

        performSurfacePlacement(false /* force */);

    }