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

Commit 2666d613 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ensure that the resize can be triggered properly" into main am: c4c91e49 am: 71842cd5 

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



Change-Id: Ibb0b9971c425d2429928ced34a0bd20f25577693
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ed66434b 71842cd5

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

+8 −0
Original line number Diff line number Diff line
@@ -2602,6 +2602,14 @@ public class WindowManagerService extends IWindowManager.Stub 
            // in the new out values right now we need to force a layout.

            mWindowPlacerLocked.performSurfacePlacement(true /* force */);



            if (!win.mHaveFrame && displayContent.mWaitingForConfig) {

                // We just forcibly triggered the layout, but this could still be intercepted by

                // mWaitingForConfig. Here, we are forcefully marking a value for mLayoutSeq to

                // ensure that the resize can occur properly later. Otherwise, the window's frame

                // will remain empty forever.

                win.mLayoutSeq = displayContent.mLayoutSeq;

            }



            if (shouldRelayout) {

                Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: viewVisibility_1");