Merge "Remove the validation check when enter split" into tm-qpr-dev (5a54deb0) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+7 −15

Original line number	Diff line number	Diff line
		@@ -1374,14 +1374,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		}
		}
		} else if (isSideStage && hasChildren && !mMainStage.isActive()) {
		if (mFocusingTaskInfo != null && !isValidToEnterSplitScreen(mFocusingTaskInfo)) {
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		mSideStage.removeAllTasks(wct, true);
		wct.reorder(mRootTaskInfo.token, false /* onTop */);
		mTaskOrganizer.applyTransaction(wct);
		Slog.i(TAG, "cancel entering split screen, reason = "
		+ exitReasonToString(EXIT_REASON_APP_DOES_NOT_SUPPORT_MULTIWINDOW));
		} else {
		// TODO (b/238697912) : Add the validation to prevent entering non-recovered status
		final WindowContainerTransaction wct = new WindowContainerTransaction();
		mSplitLayout.init();
		prepareEnterSplitScreen(wct);
		@@ -1389,7 +1382,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
		mSyncQueue.runInSync(t ->
		updateSurfaceBounds(mSplitLayout, t, false /* applyResizingOffset */));
		}
		}
		if (mMainStageListener.mHasChildren && mSideStageListener.mHasChildren) {
		mShouldUpdateRecents = true;
		updateRecentTasksSplitPair();