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

Commit 3c522643 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19206342



Change-Id: I40def93f1475d3fe8fa5b09ac9f55be0433c4162
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5ad7876 a55a6425

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;