Merge "Avoid recursion for leaf task fragment in freeform mode" into main (30f6d647) · Commits · e / os / android_frameworks_base

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

+2 −10

Original line number	Diff line number	Diff line
		@@ -1089,21 +1089,13 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		}

		final int otherWindowingMode = other.getWindowingMode();
		if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN) {
		if (isTranslucent(other, starting)) {
		// Can be visible behind a translucent fullscreen TaskFragment.
		gotTranslucentFullscreen = true;
		continue;
		}
		return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
		} else if (otherWindowingMode == WINDOWING_MODE_MULTI_WINDOW
		&& other.matchParentBounds()) {
		if (otherWindowingMode == WINDOWING_MODE_FULLSCREEN
		\|\| (otherWindowingMode != WINDOWING_MODE_PINNED && other.matchParentBounds())) {
		if (isTranslucent(other, starting)) {
		// Can be visible behind a translucent TaskFragment.
		gotTranslucentFullscreen = true;
		continue;
		}
		// Multi-window TaskFragment that matches parent bounds would occlude other children
		return TASK_FRAGMENT_VISIBILITY_INVISIBLE;
		}