Merge "Limit launching placeholder to top TaskFragment" into tm-dev (b4620e28) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
		TaskFragmentContainer getTopActiveContainer() {
		for (int i = mContainers.size() - 1; i >= 0; i--) {
		TaskFragmentContainer container = mContainers.get(i);
		if (!container.isFinished() && container.getTopNonFinishingActivity() != null) {
		if (!container.isFinished() && container.getRunningActivityCount() > 0) {
		return container;
		}
		}
		@@ -499,6 +499,10 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen
		boolean launchPlaceholderIfNecessary(@NonNull Activity activity) {
		final TaskFragmentContainer container = getContainerWithActivity(
		activity.getActivityToken());
		// Don't launch placeholder if the container is occluded.
		if (container != getTopActiveContainer()) {
		return false;
		}

		SplitContainer splitContainer = container != null ? getActiveSplitForContainer(container)
		: null;