Merge "Merge "Fix PinnedStackTests#testPinnedStackWithDockedStack" into... (79db8819) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -2786,6 +2786,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}

		final int prevMode = task.getWindowingMode();
		if (prevMode == windowingMode) {
		// The task is already in split-screen and with correct windowing mode.
		return true;
		}

		moveTaskToSplitScreenPrimaryTask(task, toTop);
		return prevMode != task.getWindowingMode();
		}