Merge "Synchronize window config updates (15/n)" into main (881f6d9b) · Commits · e / os / android_frameworks_base

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -152,6 +152,7 @@ import com.android.server.pm.UserManagerInternal;
		import com.android.server.policy.PermissionPolicyInternal;
		import com.android.server.policy.WindowManagerPolicy;
		import com.android.server.utils.Slogf;
		import com.android.window.flags.Flags;

		import java.io.FileDescriptor;
		import java.io.PrintWriter;
		@@ -795,6 +796,14 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
		}

		if (Flags.bundleClientTransactionFlag()) {
		// mWmService.mResizingWindows is populated in #applySurfaceChangesTransaction()
		handleResizingWindows();

		// Called after #handleResizingWindows to include WindowStateResizeItem if any.
		mWmService.mAtmService.getLifecycleManager().dispatchPendingTransactions();
		}

		// Send any pending task-info changes that were queued-up during a layout deferment
		mWmService.mAtmService.mTaskOrganizerController.dispatchPendingEvents();
		mWmService.mAtmService.mTaskFragmentOrganizerController.dispatchPendingEvents();
		@@ -838,12 +847,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		}
		}

		if (!Flags.bundleClientTransactionFlag()) {
		handleResizingWindows();
		}
		clearFrameChangingWindows();

		// Called after #handleResizingWindows to include WindowStateResizeItem if any.
		mWmService.mAtmService.getLifecycleManager().dispatchPendingTransactions();

		if (mWmService.mDisplayFrozen) {
		ProtoLog.v(WM_DEBUG_ORIENTATION,
		"With display frozen, orientationChangeComplete=%b",