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

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

Merge "Avoid potential recursion of surface placement" into tm-qpr-dev

parents b14c95da b51baa9e

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

+4 −0
Original line number Diff line number Diff line
@@ -779,6 +779,10 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        return leakedSurface || killedApps;

    }



    /**

     * This method should only be called from {@link WindowSurfacePlacer}. Otherwise the recursion

     * check and {@link WindowSurfacePlacer#isInLayout()} won't take effect.

     */

    void performSurfacePlacement() {

        Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "performSurfacePlacement");

        try {

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

+1 −1
Original line number Diff line number Diff line
@@ -5611,7 +5611,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                            mWindowsInsetsChanged = 0;

                            // We need to update resizing windows and dispatch the new insets state

                            // to them.

                            mRoot.performSurfacePlacement();

                            mWindowPlacerLocked.performSurfacePlacement();

                        }

                    }

                    break;