Merge changes from topic "single-task" (8536281e) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -1163,10 +1163,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// An activity is considered to be in multi-window mode if its task isn't fullscreen.
		final boolean inMultiWindowMode = inMultiWindowMode();
		if (inMultiWindowMode != mLastReportedMultiWindowMode) {
		if (!inMultiWindowMode && mLastReportedPictureInPictureMode) {
		updatePictureInPictureMode(null, false);
		} else {
		mLastReportedMultiWindowMode = inMultiWindowMode;
		scheduleMultiWindowModeChanged(getConfiguration());
		}
		}
		}

		private void scheduleMultiWindowModeChanged(Configuration overrideConfig) {
		try {

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

+91 −77

Original line number	Diff line number	Diff line
		@@ -658,8 +658,8 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		}

		@Override
		public void resolveOverrideConfiguration(Configuration newParentConfig) {
		super.resolveOverrideConfiguration(newParentConfig);
		public void resolveTileOverrideConfiguration(Configuration newParentConfig) {
		super.resolveTileOverrideConfiguration(newParentConfig);
		if (mTile != null) {
		// If this is a virtual child of a tile, simulate the parent-child relationship
		mTile.updateResolvedConfig(getResolvedOverrideConfiguration());
		@@ -742,8 +742,8 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		setBounds(newBounds);
		} else if (overrideWindowingMode != WINDOWING_MODE_PINNED) {
		// For pinned stack, resize is now part of the {@link WindowContainerTransaction}
		resize(new Rect(newBounds), null /* tempTaskBounds */,
		null /* tempTaskInsetBounds /, PRESERVE_WINDOWS, true / deferResume */);
		resize(new Rect(newBounds), null /* configBounds */,
		PRESERVE_WINDOWS, true /* deferResume */);
		}
		}
		if (prevIsAlwaysOnTop != isAlwaysOnTop()) {
		@@ -952,7 +952,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		}

		if (!Objects.equals(getRequestedOverrideBounds(), mTmpRect2)) {
		resize(mTmpRect2, null /* tempTaskBounds /, null / tempTaskInsetBounds */,
		resize(mTmpRect2, null /configBounds/,
		false /preserveWindows/, true /deferResume/);
		}
		} finally {
		@@ -1118,20 +1118,15 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		return r.getTask().mTaskId != taskId && r.appToken != notTop && r.canBeTopRunning();
		}

		ActivityRecord isInStackLocked(IBinder token) {
		final ActivityRecord r = ActivityRecord.forTokenLocked(token);
		return isInStackLocked(r);
		}

		ActivityRecord isInStackLocked(ActivityRecord r) {
		if (r == null) {
		return null;
		}
		final Task task = r.getTask();
		final ActivityStack stack = r.getRootTask();
		if (stack != null && task.mChildren.contains(r) && mChildren.contains(task)) {
		if (stack != this) Slog.w(TAG,
		"Illegal state! task does not point to stack it is in.");
		final Task task = r.getRootTask();
		if (task != null && r.isDescendantOf(task)) {
		if (task != this) Slog.w(TAG, "Illegal state! task does not point to stack it is in. "
		+ "stack=" + this + " task=" + task + " r=" + r
		+ " callers=" + Debug.getCallers(15, "\n"));
		return r;
		}
		return null;
		@@ -1207,7 +1202,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		}

		getDisplay().positionStackAtBottom(this, reason);
		if (task != null) {
		if (task != null && task != this) {
		positionChildAtBottom(task);
		}

		@@ -1251,12 +1246,12 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		mCurrentUser = userId;

		super.switchUser(userId);
		forAllTasks((t) -> {
		if (t.showToCurrentUser()) {
		forAllLeafTasks((t) -> {
		if (t.showToCurrentUser() && t != this) {
		mChildren.remove(t);
		mChildren.add(t);
		}
		}, true /* traverseTopToBottom */, this);
		}, true /* traverseTopToBottom */);
		}

		void minimalResumeActivityLocked(ActivityRecord r) {
		@@ -2450,16 +2445,16 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		boolean newTask, boolean keepCurTransition, ActivityOptions options) {
		Task rTask = r.getTask();
		final boolean allowMoveToFront = options == null \|\| !options.getAvoidMoveToFront();
		final boolean hasTask = hasChild(rTask);
		final boolean isOrhasTask = rTask == this \|\| hasChild(rTask);
		// mLaunchTaskBehind tasks get placed at the back of the task stack.
		if (!r.mLaunchTaskBehind && allowMoveToFront && (!hasTask \|\| newTask)) {
		if (!r.mLaunchTaskBehind && allowMoveToFront && (!isOrhasTask \|\| newTask)) {
		// Last activity in task had been removed or ActivityManagerService is reusing task.
		// Insert or replace.
		// Might not even be in.
		positionChildAtTop(rTask);
		}
		Task task = null;
		if (!newTask && hasTask) {
		if (!newTask && isOrhasTask) {
		final ActivityRecord occludingActivity = getActivity(
		(ar) -> !ar.finishing && ar.occludesParent(), true, rTask);
		if (occludingActivity != null) {
		@@ -2717,7 +2712,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		void finishVoiceTask(IVoiceInteractionSession session) {
		final PooledConsumer c = PooledLambda.obtainConsumer(ActivityStack::finishIfVoiceTask,
		PooledLambda.__(Task.class), session.asBinder());
		forAllTasks(c, true /* traverseTopToBottom */, this);
		forAllLeafTasks(c, true /* traverseTopToBottom */);
		c.recycle();
		}

		@@ -2818,8 +2813,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		return false;
		}
		final Task task = srec.getTask();

		if (!mChildren.contains(task) \|\| !task.hasChild(srec)) {
		if (!srec.isDescendantOf(this)) {
		return false;
		}

		@@ -2932,20 +2926,20 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		getDisplay().mDisplayContent.prepareAppTransition(transit, false);
		}

		final void moveTaskToFrontLocked(Task tr, boolean noAnimation, ActivityOptions options,
		final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options,
		AppTimeTracker timeTracker, String reason) {
		moveTaskToFrontLocked(tr, noAnimation, options, timeTracker, !DEFER_RESUME, reason);
		moveTaskToFront(tr, noAnimation, options, timeTracker, !DEFER_RESUME, reason);
		}

		final void moveTaskToFrontLocked(Task tr, boolean noAnimation, ActivityOptions options,
		final void moveTaskToFront(Task tr, boolean noAnimation, ActivityOptions options,
		AppTimeTracker timeTracker, boolean deferResume, String reason) {
		if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "moveTaskToFront: " + tr);

		final ActivityStack topStack = getDisplay().getTopStack();
		final ActivityRecord topActivity = topStack != null ? topStack.getTopNonFinishingActivity() : null;
		final int numTasks = getChildCount();
		final int index = mChildren.indexOf(tr);
		if (numTasks == 0 \|\| index < 0) {
		final ActivityRecord topActivity = topStack != null
		? topStack.getTopNonFinishingActivity() : null;

		if (tr != this && !tr.isDescendantOf(this)) {
		// nothing to do!
		if (noAnimation) {
		ActivityOptions.abort(options);
		@@ -3099,24 +3093,30 @@ class ActivityStack extends Task implements BoundsAnimationTarget {

		// TODO: Can only be called from special methods in ActivityStackSupervisor.
		// Need to consolidate those calls points into this resize method so anyone can call directly.
		void resize(Rect bounds, Rect tempTaskBounds, Rect tempTaskInsetBounds,
		boolean preserveWindows, boolean deferResume) {
		if (!updateBoundsAllowed(bounds)) {
		void resize(Rect displayedBounds, Rect configBounds, boolean preserveWindows,
		boolean deferResume) {
		if (!updateBoundsAllowed(displayedBounds)) {
		return;
		}

		Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "stack.resize_" + getRootTaskId());
		mAtmService.deferWindowLayout();
		try {
		// TODO: Why not just set this on the stack directly vs. on each tasks?
		// Update override configurations of all tasks in the stack.
		final Rect taskBounds = tempTaskBounds != null ? tempTaskBounds : bounds;
		final PooledConsumer c = PooledLambda.obtainConsumer(
		ActivityStack::processTaskResizeBounds, PooledLambda.__(Task.class),
		taskBounds, tempTaskInsetBounds);
		forAllTasks(c, true /* traverseTopToBottom */, this);
		displayedBounds, configBounds);
		forAllTasks(c, true /* traverseTopToBottom */);
		c.recycle();

		setBounds(bounds);
		if (mBoundsAnimating) {
		// Force to update task surface bounds and relayout windows, since configBounds
		// remains unchanged during bounds animation.
		updateSurfaceBounds();
		getDisplay().setLayoutNeeded();
		mWmService.requestTraversal();
		}

		if (!deferResume) {
		ensureVisibleActivitiesConfiguration(topRunningActivity(), preserveWindows);
		@@ -3127,15 +3127,16 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		}
		}

		private static void processTaskResizeBounds(Task task, Rect bounds, Rect insetBounds) {
		private static void processTaskResizeBounds(
		Task task, Rect displayedBounds, Rect configBounds) {
		if (!task.isResizeable()) return;

		if (insetBounds != null && !insetBounds.isEmpty()) {
		task.setOverrideDisplayedBounds(bounds);
		task.setBounds(insetBounds);
		if (configBounds != null && !configBounds.isEmpty()) {
		task.setOverrideDisplayedBounds(displayedBounds);
		task.setBounds(configBounds);
		} else {
		task.setOverrideDisplayedBounds(null);
		task.setBounds(bounds);
		task.setBounds(displayedBounds);
		}
		}

		@@ -3150,7 +3151,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {

		final PooledConsumer c = PooledLambda.obtainConsumer(ActivityStack::setTaskBounds,
		PooledLambda.__(Task.class), bounds);
		forAllTasks(c, true /* traverseTopToBottom */, this);
		forAllLeafTasks(c, true /* traverseTopToBottom */);
		c.recycle();
		}

		@@ -3166,7 +3167,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {

		final PooledConsumer c = PooledLambda.obtainConsumer(ActivityStack::setTaskDisplayedBounds,
		PooledLambda.__(Task.class), bounds);
		forAllTasks(c, true /* traverseTopToBottom */, this);
		forAllLeafTasks(c, true /* traverseTopToBottom */);
		c.recycle();
		}

		@@ -3262,7 +3263,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		return false;
		}
		final String prefix = " ";
		forAllTasks((task) -> {
		forAllLeafTasks((task) -> {
		if (needSep) {
		pw.println("");
		}
		@@ -3280,7 +3281,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		false /* traverseTopToBottom */);
		dumpHistoryList(fd, pw, activities, prefix, "Hist", true, !dumpAll, dumpClient,
		dumpPackage, false, null, task);
		}, true /* traverseTopToBottom */, this);
		}, true /* traverseTopToBottom */);
		return true;
		}

		@@ -3331,19 +3332,33 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		}
		}

		Task createTask(int taskId, ActivityInfo info, Intent intent, boolean toTop) {
		return createTask(taskId, info, intent, null /voiceSession/, null /voiceInteractor/,
		Task reuseOrCreateTask(ActivityInfo info, Intent intent, boolean toTop) {
		return reuseOrCreateTask(info, intent, null /voiceSession/, null /voiceInteractor/,
		toTop, null /activity/, null /source/, null /options/);
		}

		Task createTask(int taskId, ActivityInfo info, Intent intent,
		IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,
		boolean toTop, ActivityRecord activity, ActivityRecord source,
		ActivityOptions options) {
		final Task task = Task.create(
		// TODO: Can be removed once we change callpoints creating stacks to be creating tasks.
		/** Either returns this current task to be re-used or creates a new child task. */
		Task reuseOrCreateTask(ActivityInfo info, Intent intent, IVoiceInteractionSession voiceSession,
		IVoiceInteractor voiceInteractor, boolean toTop, ActivityRecord activity,
		ActivityRecord source, ActivityOptions options) {

		Task task;
		if (DisplayContent.alwaysCreateStack(getWindowingMode(), getActivityType())) {
		// This stack will only contain one task, so just return itself since all stacks ara now
		// tasks and all tasks are now stacks.
		task = reuseAsLeafTask(voiceSession, voiceInteractor, info, activity);
		} else {
		// Create child task since this stack can contain multiple tasks.
		final int taskId = activity != null
		? mStackSupervisor.getNextTaskIdForUser(activity.mUserId)
		: mStackSupervisor.getNextTaskIdForUser();
		task = Task.create(
		mAtmService, taskId, info, intent, voiceSession, voiceInteractor, this);

		// add the task to stack first, mTaskPositioner might need the stack association
		addChild(task, toTop, (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0);
		}

		int displayId = getDisplayId();
		if (displayId == INVALID_DISPLAY) displayId = DEFAULT_DISPLAY;
		final boolean isLockscreenShown = mAtmService.mStackSupervisor.getKeyguardController()
		@@ -3353,6 +3368,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		&& !matchParentBounds() && task.isResizeable() && !isLockscreenShown) {
		task.setBounds(getRequestedOverrideBounds());
		}

		return task;
		}

		@@ -3559,10 +3575,6 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		"Can't exit pinned mode if it's not pinned already.");
		}

		if (mChildren.size() != 1) {
		throw new RuntimeException("There should be only one task in a pinned stack.");
		}

		// give pinned stack a chance to save current bounds, this should happen before reparent.
		final ActivityRecord top = topRunningNonOverlayTaskActivity();
		if (top != null && top.isVisible()) {
		@@ -3592,12 +3604,12 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		final PooledConsumer c = PooledLambda.obtainConsumer(
		ActivityStackSupervisor::updatePictureInPictureMode, mStackSupervisor,
		PooledLambda.__(Task.class), targetStackBounds, forceUpdate);
		forAllTasks(c, true /* traverseTopToBottom */, this);
		forAllLeafTasks(c, true /* traverseTopToBottom */);
		c.recycle();
		}

		void prepareFreezingTaskBounds() {
		forAllTasks(Task::prepareFreezingBounds, true /* traverseTopToBottom */, this);
		forAllLeafTasks(Task::prepareFreezingBounds, true /* traverseTopToBottom */);
		}

		/**
		@@ -3629,7 +3641,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		final PooledConsumer c = PooledLambda.obtainConsumer(Task::alignToAdjustedBounds,
		PooledLambda.__(Task.class), adjusted ? mAdjustedBounds : getRawBounds(),
		insetBounds, alignBottom);
		forAllTasks(c, true /* traverseTopToBottom */, this);
		forAllLeafTasks(c, true /* traverseTopToBottom */);
		c.recycle();
		}

		@@ -3902,6 +3914,12 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		return;
		}

		if (child == this) {
		// TODO: Fix call-points
		moveToFront("positionChildAtTop");
		return;
		}

		positionChildAt(POSITION_TOP, child, true /* includingParents */);
		child.updateTaskMovement(true);

		@@ -4316,19 +4334,19 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		* to the list of to be drawn windows the service is waiting for.
		*/
		void beginImeAdjustAnimation() {
		forAllTasks((t) -> {
		forAllLeafTasks((t) -> {
		if (t.hasContentToDisplay()) {
		t.setDragResizing(true, DRAG_RESIZE_MODE_DOCKED_DIVIDER);
		t.setWaitingForDrawnIfResizingChanged();
		}
		}, true /* traverseTopToBottom */, this);
		}, true /* traverseTopToBottom */);
		}

		/** Resets the resizing state of all windows. */
		void endImeAdjustAnimation() {
		forAllTasks((t) -> {
		forAllLeafTasks((t) -> {
		t.setDragResizing(false, DRAG_RESIZE_MODE_DOCKED_DIVIDER);
		}, true /* traverseTopToBottom */, this);
		}, true /* traverseTopToBottom */);
		}

		private int getMinTopStackBottom(final Rect displayContentRect, int originalStackBottom) {
		@@ -4572,19 +4590,15 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		return task != null;
		}

		public boolean setPinnedStackSize(Rect stackBounds, Rect tempTaskBounds) {
		public boolean setPinnedStackSize(Rect displayedBounds, Rect configBounds) {
		// Hold the lock since this is called from the BoundsAnimator running on the UiThread
		synchronized (mWmService.mGlobalLock) {
		if (mCancelCurrentBoundsAnimation) {
		return false;
		}
		mStackSupervisor.resizePinnedStack(displayedBounds, configBounds);
		}

		try {
		mWmService.mActivityTaskManager.resizePinnedStack(stackBounds, tempTaskBounds);
		} catch (RemoteException e) {
		// I don't believe you.
		}
		return true;
		}

		@@ -4730,7 +4744,7 @@ class ActivityStack extends Task implements BoundsAnimationTarget {
		/** Called immediately prior to resizing the tasks at the end of the pinned stack animation. */
		void onPipAnimationEndResize() {
		mBoundsAnimating = false;
		forAllTasks(Task::clearPreserveNonFloatingState, false /* traverseTopToBottom */, this);
		forAllLeafTasks(Task::clearPreserveNonFloatingState, false /* traverseTopToBottom */);
		mWmService.requestTraversal();
		}

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

+44 −26

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -2366,7 +2366,7 @@ class ActivityStarter {
		// task on top there.
		// Defer resuming the top activity while moving task to top, since the
		// current task-top activity may not be the activity that should be resumed.
		mTargetStack.moveTaskToFrontLocked(intentTask, mNoAnimation, mOptions,
		mTargetStack.moveTaskToFront(intentTask, mNoAnimation, mOptions,
		mStartActivity.appTimeTracker, DEFER_RESUME,
		"bringingFoundTaskToFront");
		mMovedToFront = !isSplitScreenTopStack;
		@@ -2396,8 +2396,7 @@ class ActivityStarter {

		private void setNewTask(Task taskToAffiliate) {
		final boolean toTop = !mLaunchTaskBehind && !mAvoidMoveToFront;
		final Task task = mTargetStack.createTask(
		mSupervisor.getNextTaskIdForUser(mStartActivity.mUserId),
		final Task task = mTargetStack.reuseOrCreateTask(
		mNewTaskInfo != null ? mNewTaskInfo : mStartActivity.info,
		mNewTaskIntent != null ? mNewTaskIntent : mIntent, mVoiceSession,
		mVoiceInteractor, toTop, mStartActivity, mSourceRecord, mOptions);

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

+14 −6

Original line number	Diff line number	Diff line
		@@ -2760,9 +2760,17 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		throw new IllegalArgumentException("setTaskWindowingMode: Attempt to move"
		+ " non-standard task " + taskId + " to split-screen windowing mode");
		}
		if (!task.supportsSplitScreenWindowingMode()) {
		return false;
		}

		final int prevMode = task.getWindowingMode();
		final ActivityStack stack = task.getStack();
		moveTaskToSplitScreenPrimaryTile(task, toTop);
		return prevMode != task.getWindowingMode();
		}

		void moveTaskToSplitScreenPrimaryTile(Task task, boolean toTop) {
		ActivityStack stack = task.getStack();
		TaskTile tile = null;
		for (int i = stack.getDisplay().getStackCount() - 1; i >= 0; --i) {
		tile = stack.getDisplay().getStackAt(i).asTile();
		@@ -2776,7 +2784,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		WindowContainerTransaction wct = new WindowContainerTransaction();
		wct.reparent(stack.mRemoteToken, tile.mRemoteToken, toTop);
		mTaskOrganizerController.applyContainerTransaction(wct, null);
		return prevMode != task.getWindowingMode();
		}

		/**
		@@ -3247,8 +3254,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}

		final ActivityStack stack = r.getRootTask();
		final Task task = stack.createTask(
		mStackSupervisor.getNextTaskIdForUser(r.mUserId), ainfo, intent, !ON_TOP);
		final Task task = stack.getDisplay().createStack(stack.getWindowingMode(),
		stack.getActivityType(), !ON_TOP, ainfo, intent);

		if (!mRecentTasks.addToBottom(task)) {
		// The app has too many tasks already and we can't add any more
		stack.removeChild(task, "addAppTask");
		@@ -4426,12 +4434,12 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		}

		@Override
		public void resizePinnedStack(Rect pinnedBounds, Rect tempPinnedTaskBounds) {
		public void resizePinnedStack(Rect displayedBounds, Rect configBounds) {
		enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "resizePinnedStack()");
		final long ident = Binder.clearCallingIdentity();
		try {
		synchronized (mGlobalLock) {
		mStackSupervisor.resizePinnedStackLocked(pinnedBounds, tempPinnedTaskBounds);
		mStackSupervisor.resizePinnedStack(displayedBounds, configBounds);
		}
		} finally {
		Binder.restoreCallingIdentity(ident);