Merge changes I937b7083,I2f681871 (2a459678) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1408,7 +1408,7 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> {
		boolean preserveWindows, boolean notifyClients) {
		for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) {
		final ActivityStack stack = getChildAt(stackNdx);
		stack.ensureActivitiesVisibleLocked(starting, configChanges, preserveWindows,
		stack.ensureActivitiesVisible(starting, configChanges, preserveWindows,
		notifyClients);
		}
		}

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

+21 −2

Original line number	Diff line number	Diff line
		@@ -333,6 +333,9 @@ import java.util.Arrays;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Objects;
		import java.util.function.Consumer;
		import java.util.function.Function;
		import java.util.function.Predicate;

		/**
		* An entry in the history stack, representing an activity.
		@@ -1581,6 +1584,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		return this;
		}

		@Override
		boolean hasActivity() {
		// I am an activity!
		return true;
		}

		void setProcess(WindowProcessController proc) {
		app = proc;
		final ActivityRecord root = task != null ? task.getRootActivity() : null;
		@@ -3418,10 +3427,20 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}

		@Override
		boolean forAllActivities(ToBooleanFunction<ActivityRecord> callback) {
		boolean forAllActivities(Function<ActivityRecord, Boolean> callback) {
		return callback.apply(this);
		}

		@Override
		void forAllActivities(Consumer<ActivityRecord> callback, boolean traverseTopToBottom) {
		callback.accept(this);
		}

		@Override
		ActivityRecord getActivity(Predicate<ActivityRecord> callback, boolean traverseTopToBottom) {
		return callback.test(this) ? this : null;
		}

		@Override
		protected void setLayer(Transaction t, int layer) {
		if (!mSurfaceAnimator.hasLeash()) {
		@@ -4550,7 +4569,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// If the activity is stopped, stopping, cycle to an active state. We avoid doing
		// this when there is an activity waiting to become translucent as the extra binder
		// calls will lead to noticeable jank. A later call to
		// ActivityStack#ensureActivitiesVisibleLocked will bring the activity to a proper
		// ActivityStack#ensureActivitiesVisible will bring the activity to a proper
		// active state.
		if (!isState(STARTED, RESUMED, PAUSED, STOPPED, STOPPING)
		\|\| getActivityStack().mTranslucentActivityWaiting != null) {

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

+27 −469

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -975,7 +975,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		}
		}

		void startSpecificActivityLocked(ActivityRecord r, boolean andResume, boolean checkConfig) {
		void startSpecificActivity(ActivityRecord r, boolean andResume, boolean checkConfig) {
		// Is this activity's application already running?
		final WindowProcessController wpc =
		mService.getProcessController(r.processName, r.info.applicationInfo.uid);
		@@ -1742,12 +1742,12 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		* to the fullscreen stack. This is to guarantee that when we are removing a stack,
		* that the client receives onStop() before it is reparented. We do this by detaching
		* the stack from the display so that it will be considered invisible when
		* ensureActivitiesVisibleLocked() is called, and all of its activitys will be marked
		* ensureActivitiesVisible() is called, and all of its activitys will be marked
		* invisible as well and added to the stopping list. After which we process the
		* stopping list by handling the idle.
		*/
		stack.mForceHidden = true;
		stack.ensureActivitiesVisibleLocked(null, 0, PRESERVE_WINDOWS);
		stack.ensureActivitiesVisible(null, 0, PRESERVE_WINDOWS);
		stack.mForceHidden = false;
		activityIdleInternalLocked(null, false /* fromTimeout */,
		true /* processPausingActivites /, null / configuration */);
		@@ -2072,7 +2072,7 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {

		mRecentTasks.add(task);
		mService.getTaskChangeNotificationController().notifyTaskStackChanged();
		stack.ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS);
		stack.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS);

		// When launching tasks behind, update the last active time of the top task after the new
		// task has been shown briefly

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1574,7 +1574,7 @@ class ActivityStarter {
		// Also, we don't want to resume activities in a task that currently has an overlay
		// as the starting activity just needs to be in the visible paused state until the
		// over is removed.
		mTargetStack.ensureActivitiesVisibleLocked(mStartActivity, 0, !PRESERVE_WINDOWS);
		mTargetStack.ensureActivitiesVisible(mStartActivity, 0, !PRESERVE_WINDOWS);
		// Go ahead and tell window manager to execute app transition for this activity
		// since the app transition will not be triggered through the resume channel.
		mTargetStack.getDisplay().mDisplayContent.executeAppTransition();
		@@ -1812,7 +1812,7 @@ class ActivityStarter {
		final boolean resetTask =
		reusedActivity != null && (mLaunchFlags & FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) != 0;
		if (resetTask) {
		targetTaskTop = mTargetStack.resetTaskIfNeededLocked(targetTaskTop, mStartActivity);
		targetTaskTop = mTargetStack.resetTaskIfNeeded(targetTaskTop, mStartActivity);
		}

		if ((mLaunchFlags & (FLAG_ACTIVITY_NEW_TASK \| FLAG_ACTIVITY_CLEAR_TASK))