Merge "Update recent tasks order when the last resumed activity changed" into tm-qpr-dev (d7f0da67) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -4715,6 +4715,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		mTaskChangeNotificationController.notifyTaskFocusChanged(prevTask.mTaskId, false);
		}
		mTaskChangeNotificationController.notifyTaskFocusChanged(task.mTaskId, true);
		mTaskSupervisor.mRecentTasks.add(task);
		}

		applyUpdateLockStateLocked(r);

+13 −0

Original line number	Diff line number	Diff line
		@@ -248,6 +248,19 @@ public class ActivityTaskSupervisorTests extends WindowTestsBase {
		eq(true) /* focused */);
		}

		/**
		* Ensures it updates recent tasks order when the last resumed activity changed.
		*/
		@Test
		public void testUpdateRecentTasksForTopResumed() {
		spyOn(mSupervisor.mRecentTasks);
		final ActivityRecord activity = new ActivityBuilder(mAtm).setCreateTask(true).build();
		final Task task = activity.getTask();

		mAtm.setLastResumedActivityUncheckLocked(activity, "test");
		verify(mSupervisor.mRecentTasks).add(eq(task));
		}

		/**
		* Ensures that a trusted display can launch arbitrary activity and an untrusted display can't.
		*/