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

Commit 6f682481 authored Nov 30, 2021 by Tiger Huang

Move win.skipLayout into policy.layoutWindowLw

This CL restore the previous logic to skip layout but still update
mLayoutSeq. In this way, we can still report resized to the client.

Fix: 207144283
Test: atest PinnedStackTests#testTranslucentActivityOnTopOfPinnedTask
Change-Id: I5a4a09899fef194d002a7e74bc4ad64685d4e689

parent 86ef373a

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -800,7 +800,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		};

		private final Consumer<WindowState> mPerformLayout = w -> {
		if (w.mLayoutAttached \|\| w.skipLayout()) {
		if (w.mLayoutAttached) {
		return;
		}

		@@ -858,7 +858,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		};

		private final Consumer<WindowState> mPerformLayoutAttached = w -> {
		if (!w.mLayoutAttached \|\| w.skipLayout()) {
		if (!w.mLayoutAttached) {
		return;
		}
		if (DEBUG_LAYOUT) Slog.v(TAG, "2ND PASS " + w + " mHaveFrame=" + w.mHaveFrame

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

+3 −0

Original line number	Diff line number	Diff line
		@@ -1490,6 +1490,9 @@ public class DisplayPolicy {
		* @param displayFrames The display frames.
		*/
		public void layoutWindowLw(WindowState win, WindowState attached, DisplayFrames displayFrames) {
		if (win.skipLayout()) {
		return;
		}

		// This window might be in the simulated environment.
		// We invoke this to get the proper DisplayFrames.