Merge "Exclude the embedded tasks from Recents" into sc-v2-dev (254072f3) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -1346,7 +1346,8 @@ class RecentTasks {
		+ " activityType=" + task.getActivityType()
		+ " windowingMode=" + task.getWindowingMode()
		+ " isAlwaysOnTopWhenVisible=" + task.isAlwaysOnTopWhenVisible()
		+ " intentFlags=" + task.getBaseIntent().getFlags());
		+ " intentFlags=" + task.getBaseIntent().getFlags()
		+ " isEmbedded=" + task.isEmbedded());
		}

		switch (task.getActivityType()) {
		@@ -1392,6 +1393,11 @@ class RecentTasks {
		return false;
		}

		// Ignore the task if it is a embedded task
		if (task.isEmbedded()) {
		return false;
		}

		return true;
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -787,6 +787,19 @@ public class RecentTasksTest extends WindowTestsBase {
		triggerTrimAndAssertTrimmed(mTasks.get(0), mTasks.get(1), mTasks.get(2), mTasks.get(3));
		}

		@Test
		public void testVisibleEmbeddedTask_expectNotVisible() {
		Task task = createTaskBuilder(".Task")
		.setFlags(FLAG_ACTIVITY_NEW_TASK)
		.build();
		doReturn(true).when(task).isEmbedded();
		mRecentTasks.add(task);

		assertThat(mCallbacksRecorder.mAdded).hasSize(1);
		assertFalse("embedded task should not be visible recents",
		mRecentTasks.isVisibleRecentTask(task));
		}

		@Test
		public void testFreezeTaskListOrder_reorderExistingTask() {
		// Add some tasks