Merge "Merge "Exclude transient activity from hide-tasks" into udc-dev am:... (1ff9050a) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -278,13 +278,14 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
		setTransientLaunchToChanges(activity);

		if (restoreBelow != null) {
		final Task transientRootTask = activity.getRootTask();
		// Collect all visible activities which can be occluded by the transient activity to
		// make sure they are in the participants so their visibilities can be updated when
		// finishing transition.
		((WindowContainer<?>) restoreBelow.getParent()).forAllTasks(t -> {
		if (t.isVisibleRequested() && !t.isAlwaysOnTop()
		&& !t.getWindowConfiguration().tasksAreFloating()) {
		if (t.isRootTask()) {
		if (t.isRootTask() && t != transientRootTask) {
		mTransientHideTasks.add(t);
		}
		if (t.isLeafTask()) {