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

Commit 4981f15b authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Window Manager spring cleaning 

Our performance for wmLayout + prepareSurfaces regressed over
time, because we added a lot of functionality, but didn't have
fine grained perf tests enough to catch it.

This CL tries to attempt to undo that damage by optimizing various
things that regressed or didn't regress, but could still be
optimized.

Test: Presubmit tests + capture trace during wmRelayout
Bug: 129389526
Change-Id: I352a3213f074377bd10721d16535c1e27fb2e746
parent 2a127a77

core/java/android/view/DisplayCutout.java

+8 −2
Original line number Diff line number Diff line
@@ -512,8 +512,8 @@ public final class DisplayCutout { 
     * @hide

     */

    public DisplayCutout inset(int insetLeft, int insetTop, int insetRight, int insetBottom) {

        if (isBoundsEmpty()

                || insetLeft == 0 && insetTop == 0 && insetRight == 0 && insetBottom == 0) {

        if (insetLeft == 0 && insetTop == 0 && insetRight == 0 && insetBottom == 0

                || isBoundsEmpty()) {

            return this;

        }
@@ -534,6 +534,12 @@ public final class DisplayCutout { 
            safeInsets.right = atLeastZero(safeInsets.right - insetRight);

        }



        // If we are not cutting off part of the cutout by insetting it on bottom/right, and we also

        // don't move it around, we can avoid the allocation and copy of the instance.

        if (insetLeft == 0 && insetTop == 0 && mSafeInsets.equals(safeInsets)) {

            return this;

        }



        Rect[] bounds = mBounds.getRects();

        for (int i = 0; i < bounds.length; ++i) {

            if (!bounds[i].equals(ZERO_RECT)) {

services/core/java/com/android/server/policy/PhoneWindowManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2263,7 +2263,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }



        boolean hideDockDivider = attrs.type == TYPE_DOCK_DIVIDER

                && !mWindowManagerInternal.isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

                && !mWindowManagerInternal.isStackVisibleLw(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        // If AOD is showing, the IME should be hidden. However, sometimes the AOD is considered

        // hidden because it's in the process of hiding, but it's still being shown on screen.

        // In that case, we want to continue hiding the IME until the windows have completed

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

+1 −1
Original line number Diff line number Diff line
@@ -1976,7 +1976,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        final boolean surfaceReady = w.isDrawnLw()  // Regular case

                || w.mWinAnimator.mSurfaceDestroyDeferred  // The preserved surface is still ready.

                || w.isDragResizeChanged();  // Waiting for relayoutWindow to call preserveSurface.

        final boolean needsLetterbox = w.isLetterboxedAppWindow() && fillsParent() && surfaceReady;

        final boolean needsLetterbox = surfaceReady && w.isLetterboxedAppWindow() && fillsParent();

        if (needsLetterbox) {

            if (mLetterbox == null) {

                mLetterbox = new Letterbox(() -> makeChildSurface(null));

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

+3 −2
Original line number Diff line number Diff line
@@ -173,8 +173,9 @@ public class BarController { 
        }

        final boolean wasVis = mWin.isVisibleLw();

        final boolean wasAnim = mWin.isAnimatingLw();

        final boolean change = show ? mWin.showLw(!mNoAnimationOnNextShow && !skipAnimation())

                : mWin.hideLw(!mNoAnimationOnNextShow && !skipAnimation());

        final boolean skipAnim = skipAnimation();

        final boolean change = show ? mWin.showLw(!mNoAnimationOnNextShow && !skipAnim)

                : mWin.hideLw(!mNoAnimationOnNextShow && !skipAnim);

        mNoAnimationOnNextShow = false;

        final int state = computeStateLw(wasVis, wasAnim, mWin, change);

        final boolean stateChanged = updateStateLw(state);

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

+50 −28
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; 
import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;

import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;

import static android.content.res.Configuration.ORIENTATION_PORTRAIT;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.FLAG_PRIVATE;

import static android.view.Display.FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS;
@@ -3094,7 +3095,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


    /** Updates the layer assignment of windows on this display. */

    void assignWindowLayers(boolean setLayoutNeeded) {

        Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "assignWindowLayers");

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "assignWindowLayers");

        assignChildLayers(getPendingTransaction());

        if (setLayoutNeeded) {

            setLayoutNeeded();
@@ -3105,7 +3106,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        // prepareSurfaces. This allows us to synchronize Z-ordering changes with

        // the hiding and showing of surfaces.

        scheduleAnimation();

        Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);

        Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

    }



    // TODO: This should probably be called any time a visual change is made to the hierarchy like
@@ -3659,9 +3660,14 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            // FIRST AND ONE HALF LOOP: Make WindowManagerPolicy think it is animating.

            pendingLayoutChanges = 0;



            Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "applyPostLayoutPolicy");

            try {

                mDisplayPolicy.beginPostLayoutPolicyLw();

                forAllWindows(mApplyPostLayoutPolicy, true /* traverseTopToBottom */);

                pendingLayoutChanges |= mDisplayPolicy.finishPostLayoutPolicyLw();

            } finally {

                Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

            }

            if (DEBUG_LAYOUT_REPEATS) surfacePlacer.debugLayoutRepeats(

                    "after finishPostLayoutPolicyLw", pendingLayoutChanges);

                mInsetsStateController.onPostLayout();
@@ -3670,7 +3676,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        mTmpApplySurfaceChangesTransactionState.reset();



        mTmpRecoveringMemory = recoveringMemory;



        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "applyWindowSurfaceChanges");

        try {

            forAllWindows(mApplySurfaceChangesTransaction, true /* traverseTopToBottom */);

        } finally {

            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

        }

        prepareSurfaces();



        mLastHasContent = mTmpApplySurfaceChangesTransactionState.displayHasContent;
@@ -3720,11 +3732,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        out.set(left, top, left + width, top + height);

    }



    @Override

    public void getBounds(Rect out) {

        calculateBounds(mDisplayInfo, out);

    }



    private void getBounds(Rect out, int orientation) {

        getBounds(out);
@@ -3746,6 +3753,15 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
    }



    void performLayout(boolean initial, boolean updateInputWindows) {

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "performLayout");

        try {

            performLayoutNoTrace(initial, updateInputWindows);

        } finally {

            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

        }

    }



    private void performLayoutNoTrace(boolean initial, boolean updateInputWindows) {

        if (!isLayoutNeeded()) {

            return;

        }
@@ -3755,13 +3771,14 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        final int dh = mDisplayInfo.logicalHeight;

        if (DEBUG_LAYOUT) {

            Slog.v(TAG, "-------------------------------------");

            Slog.v(TAG, "performLayout: needed=" + isLayoutNeeded() + " dw=" + dw + " dh=" + dh);

            Slog.v(TAG, "performLayout: needed=" + isLayoutNeeded() + " dw=" + dw

                    + " dh=" + dh);

        }



        mDisplayFrames.onDisplayInfoUpdated(mDisplayInfo,

                calculateDisplayCutoutForRotation(mDisplayInfo.rotation));

        // TODO: Not sure if we really need to set the rotation here since we are updating from the

        // display info above...

        // TODO: Not sure if we really need to set the rotation here since we are updating from

        // the display info above...

        mDisplayFrames.mRotation = mRotation;

        mDisplayPolicy.beginLayoutLw(mDisplayFrames, getConfiguration().uiMode);
@@ -4801,6 +4818,8 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


    @Override

    void prepareSurfaces() {

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "prepareSurfaces");

        try {

            final ScreenRotationAnimation screenRotationAnimation =

                    mWmService.mAnimator.getScreenRotationAnimationLocked(mDisplayId);

            if (screenRotationAnimation != null && screenRotationAnimation.isAnimating()) {
@@ -4815,6 +4834,9 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
            }



            super.prepareSurfaces();

        } finally {

            Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);

        }

    }



    void assignStackOrdering() {