Merge "Move okToShowLocked out of ActivityStack" (d3ccdd18) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import static android.app.ActivityManager.StackId;
		import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
		import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
		import static android.content.pm.ActivityInfo.FLAG_ON_TOP_LAUNCHER;
		import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;
		import static android.content.pm.ActivityInfo.RESIZE_MODE_CROP_WINDOWS;
		import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;
		import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;
		@@ -1290,6 +1291,13 @@ final class ActivityRecord {
		return this;
		}

		/** Checks whether the activity should be shown for current user. */
		public boolean okToShowLocked() {
		return (info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0
		\|\| (mStackSupervisor.isCurrentProfileLocked(userId)
		&& !service.mUserController.isUserStoppingOrShuttingDownLocked(userId));
		}

		/**
		* This method will return true if the activity is either visible, is becoming visible, is
		* currently pausing, or is resumed.

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

+10 −20

Original line number	Diff line number	Diff line
		@@ -544,10 +544,6 @@ final class ActivityStack {
		}
		}

		boolean okToShowLocked(ActivityRecord r) {
		return mStackSupervisor.okToShowLocked(r);
		}

		final ActivityRecord topRunningActivityLocked() {
		for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
		ActivityRecord r = mTaskHistory.get(taskNdx).topRunningActivityLocked();
		@@ -564,7 +560,7 @@ final class ActivityStack {
		final ArrayList<ActivityRecord> activities = task.mActivities;
		for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {
		ActivityRecord r = activities.get(activityNdx);
		if (!r.finishing && !r.delayedResume && r != notTop && okToShowLocked(r)) {
		if (!r.finishing && !r.delayedResume && r != notTop && r.okToShowLocked()) {
		return r;
		}
		}
		@@ -591,7 +587,7 @@ final class ActivityStack {
		for (int i = activities.size() - 1; i >= 0; --i) {
		final ActivityRecord r = activities.get(i);
		// Note: the taskId check depends on real taskId fields being non-zero
		if (!r.finishing && (token != r.appToken) && okToShowLocked(r)) {
		if (!r.finishing && (token != r.appToken) && r.okToShowLocked()) {
		return r;
		}
		}
		@@ -854,13 +850,11 @@ final class ActivityStack {

		for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
		final TaskRecord task = mTaskHistory.get(taskNdx);
		final boolean notCurrentUserTask =
		!mStackSupervisor.isCurrentProfileLocked(task.userId);
		final ArrayList<ActivityRecord> activities = task.mActivities;

		for (int activityNdx = activities.size() - 1; activityNdx >= 0; --activityNdx) {
		ActivityRecord r = activities.get(activityNdx);
		if (notCurrentUserTask && (r.info.flags & FLAG_SHOW_FOR_ALL_USERS) == 0) {
		if (!r.okToShowLocked()) {
		continue;
		}
		if (!r.finishing && r.userId == userId) {
		@@ -894,10 +888,7 @@ final class ActivityStack {
		for (int i = 0; i < index; ) {
		final TaskRecord task = mTaskHistory.get(i);

		// NOTE: If {@link TaskRecord#topRunningActivityLocked} return is not null then it is
		// okay to show the activity when locked.
		if (mStackSupervisor.isCurrentProfileLocked(task.userId)
		\|\| task.topRunningActivityLocked() != null) {
		if (task.okToShowLocked()) {
		if (DEBUG_TASKS) Slog.d(TAG_TASKS, "switchUserLocked: stack=" + getStackId() +
		" moving " + task + " to top");
		mTaskHistory.remove(i);
		@@ -1898,7 +1889,7 @@ final class ActivityStack {
		boolean stackVisibleBehind, ActivityRecord visibleBehind,
		boolean behindFullscreenActivity) {

		if (!okToShowLocked(r)) {
		if (r == null \|\| !r.okToShowLocked()) {
		return false;
		}

		@@ -2655,8 +2646,7 @@ final class ActivityStack {
		}
		// Calculate maximum possible position for this task.
		int maxPosition = mTaskHistory.size();
		if (!mStackSupervisor.isCurrentProfileLocked(task.userId)
		&& task.topRunningActivityLocked() == null) {
		if (!task.okToShowLocked()) {
		// Put non-current user tasks below current user tasks.
		while (maxPosition > 0) {
		final TaskRecord tmpTask = mTaskHistory.get(maxPosition - 1);
		@@ -2717,9 +2707,9 @@ final class ActivityStack {
		// Now put task at top.
		int taskNdx = mTaskHistory.size();
		final boolean notShownWhenLocked =
		(newActivity != null && (newActivity.info.flags & FLAG_SHOW_FOR_ALL_USERS) == 0)
		\|\| (newActivity == null && task.topRunningActivityLocked() == null);
		if (!mStackSupervisor.isCurrentProfileLocked(task.userId) && notShownWhenLocked) {
		(newActivity != null && !newActivity.okToShowLocked())
		\|\| (newActivity == null && !task.okToShowLocked());
		if (notShownWhenLocked) {
		// Put non-current user tasks below current user tasks.
		while (--taskNdx >= 0) {
		final TaskRecord tmpTask = mTaskHistory.get(taskNdx);
		@@ -4375,7 +4365,7 @@ final class ActivityStack {

		// Don't refocus if invisible to current user
		ActivityRecord top = tr.getTopActivity();
		if (!okToShowLocked(top)) {
		if (top == null \|\| !top.okToShowLocked()) {
		addRecentActivityLocked(top);
		ActivityOptions.abort(options);
		return;

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -123,7 +123,6 @@ import static android.app.ActivityManager.StackId.LAST_STATIC_STACK_ID;
		import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
		import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
		import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
		import static android.content.pm.ActivityInfo.FLAG_SHOW_FOR_ALL_USERS;
		import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import static android.os.Trace.TRACE_TAG_ACTIVITY_MANAGER;
		import static com.android.server.am.ActivityManagerDebugConfig.DEBUG_ALL;
		@@ -3080,13 +3079,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		return mService.mUserController.isCurrentProfileLocked(userId);
		}

		/** Checks whether the activity should be shown for current user. */
		boolean okToShowLocked(ActivityRecord r) {
		return r != null && ((r.info.flags & FLAG_SHOW_FOR_ALL_USERS) != 0
		\|\| (isCurrentProfileLocked(r.userId)
		&& !mService.mUserController.isUserStoppingOrShuttingDownLocked(r.userId)));
		}

		final ArrayList<ActivityRecord> processStoppingActivitiesLocked(boolean remove) {
		ArrayList<ActivityRecord> stops = null;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1262,7 +1262,7 @@ class ActivityStarter {
		// of this in the record so that we can skip it when trying to find
		// the top running activity.
		mDoResume = doResume;
		if (!doResume \|\| !mSupervisor.okToShowLocked(r)) {
		if (!doResume \|\| !r.okToShowLocked()) {
		r.delayedResume = true;
		mDoResume = false;
		}

services/core/java/com/android/server/am/TaskRecord.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -683,7 +683,7 @@ final class TaskRecord {
		if (stack != null) {
		for (int activityNdx = mActivities.size() - 1; activityNdx >= 0; --activityNdx) {
		ActivityRecord r = mActivities.get(activityNdx);
		if (!r.finishing && stack.okToShowLocked(r)) {
		if (!r.finishing && r.okToShowLocked()) {
		return r;
		}
		}
		@@ -696,7 +696,7 @@ final class TaskRecord {
		for (int activityNdx = mActivities.size() - 1; activityNdx >= 0; --activityNdx) {
		ActivityRecord r = mActivities.get(activityNdx);
		if (r.mStartingWindowState != STARTING_WINDOW_SHOWN
		\|\| r.finishing \|\| !stack.okToShowLocked(r)) {
		\|\| r.finishing \|\| !r.okToShowLocked()) {
		continue;
		}
		return r;
		@@ -705,6 +705,13 @@ final class TaskRecord {
		return null;
		}

		boolean okToShowLocked() {
		// NOTE: If {@link TaskRecord#topRunningActivityLocked} return is not null then it is
		// okay to show the activity when locked.
		return mService.mStackSupervisor.isCurrentProfileLocked(userId)
		\|\| topRunningActivityLocked() != null;
		}

		void setFrontOfTask() {
		setFrontOfTask(null);
		}