Merge "Cleanup enableUseTopVisibleActivityForExcludeFromRecentTask flag" into main (64f0f305) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -54,7 +54,6 @@ import androidx.annotation.Nullable;
		import androidx.annotation.VisibleForTesting;

		import com.android.internal.protolog.ProtoLog;
		import com.android.launcher3.Flags;
		import com.android.wm.shell.common.ExternalInterfaceBinder;
		import com.android.wm.shell.common.RemoteCallable;
		import com.android.wm.shell.common.ShellExecutor;
		@@ -553,9 +552,7 @@ public class RecentTasksController implements TaskStackListenerCallback,
		groupedTasks.add(GroupedTaskInfo.forSplitTasks(taskInfo, pairedTaskInfo,
		mTaskSplitBoundsMap.get(pairedTaskId)));
		} else {
		if (
		Flags.enableUseTopVisibleActivityForExcludeFromRecentTask()
		&& isWallpaperTask(taskInfo)) {
		if (isWallpaperTask(taskInfo)) {
		// Don't add the wallpaper task as an entry in grouped tasks
		continue;
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java

+7 −13

Original line number	Diff line number	Diff line
		@@ -22,13 +22,13 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
		import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

		import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
		import static com.android.launcher3.Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK;
		import static com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_PERSISTENCE;
		import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_FREEFORM;
		import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_FULLSCREEN;
		import static com.android.wm.shell.shared.GroupedTaskInfo.TYPE_SPLIT;
		import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50;

		import static org.junit.Assert.assertArrayEquals;
		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertNotNull;
		@@ -65,8 +65,8 @@ import android.platform.test.annotations.EnableFlags;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.view.SurfaceControl;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.dx.mockito.inline.extended.ExtendedMockito;
		import com.android.dx.mockito.inline.extended.StaticMockitoSession;
		@@ -253,7 +253,6 @@ public class RecentTasksControllerTest extends ShellTestCase {
		t3.taskId, -1);
		}

		@EnableFlags(FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)
		@Test
		public void testGetRecentTasks_removesDesktopWallpaperActivity() {
		RecentTaskInfo t1 = makeTaskInfo(1);
		@@ -753,15 +752,9 @@ public class RecentTasksControllerTest extends ShellTestCase {
		/**
		* Helper to set the raw task list on the controller.
		*/
		private ArrayList<RecentTaskInfo> setRawList(
		RecentTaskInfo... tasks) {
		ArrayList<RecentTaskInfo> rawList = new ArrayList<>();
		for (RecentTaskInfo task : tasks) {
		rawList.add(task);
		}
		doReturn(rawList).when(mActivityTaskManager).getRecentTasks(anyInt(), anyInt(),
		private void setRawList(RecentTaskInfo... tasks) {
		doReturn(Arrays.asList(tasks)).when(mActivityTaskManager).getRecentTasks(anyInt(), anyInt(),
		anyInt());
		return rawList;
		}

		/**
		@@ -794,8 +787,9 @@ public class RecentTasksControllerTest extends ShellTestCase {
		assertNull(pair.getSplitBounds());
		}
		}
		assertTrue("Expected: " + Arrays.toString(expectedTaskIds)
		assertArrayEquals("Expected: " + Arrays.toString(expectedTaskIds)
		+ " Received: " + Arrays.toString(flattenedTaskIds),
		Arrays.equals(flattenedTaskIds, expectedTaskIds));
		flattenedTaskIds,
		expectedTaskIds);
		}
		}

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

+1 −7

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW;
		import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

		import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_TASKS;
		import static com.android.launcher3.Flags.enableUseTopVisibleActivityForExcludeFromRecentTask;
		import static com.android.server.wm.ActivityRecord.State.RESUMED;
		import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RECENTS;
		import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RECENTS_TRIM_TASKS;
		@@ -1528,12 +1527,7 @@ class RecentTasks {
		}
		// The Recents is only supported on default display now, we should only keep the
		// most recent task of home display.
		boolean isMostRecentTask;
		if (enableUseTopVisibleActivityForExcludeFromRecentTask()) {
		isMostRecentTask = task.getTopVisibleActivity() != null;
		} else {
		isMostRecentTask = taskIndex == 0;
		}
		boolean isMostRecentTask = task.getTopVisibleActivity() != null;
		return (task.isOnHomeDisplay() && isMostRecentTask);
		}
		}

services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java

+0 −38

Original line number	Diff line number	Diff line
		@@ -70,8 +70,6 @@ import android.os.Bundle;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.UserManager;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.platform.test.annotations.Presubmit;
		import android.platform.test.flag.junit.SetFlagsRule;
		import android.util.ArraySet;
		@@ -82,11 +80,9 @@ import android.window.TaskSnapshot;

		import androidx.test.filters.MediumTest;

		import com.android.launcher3.Flags;
		import com.android.server.wm.RecentTasks.Callbacks;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		@@ -717,18 +713,7 @@ public class RecentTasksTest extends WindowTestsBase {
		}

		@Test
		@DisableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)
		public void testVisibleTasks_excludedFromRecents() {
		testVisibleTasks_excludedFromRecents_internal();
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)
		public void testVisibleTasks_excludedFromRecents_withRefactorFlag() {
		testVisibleTasks_excludedFromRecents_internal();
		}

		private void testVisibleTasks_excludedFromRecents_internal() {
		mRecentTasks.setParameters(-1 /* min /, 4 / max /, -1 / ms */);

		Task invisibleExcludedTask = createTaskBuilder(".ExcludedTask1")
		@@ -766,19 +751,7 @@ public class RecentTasksTest extends WindowTestsBase {
		}

		@Test
		@Ignore("b/342627272")
		@DisableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)
		public void testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask() {
		testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask_internal();
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)
		public void testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask_withRefactorFlag() {
		testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask_internal();
		}

		private void testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask_internal() {
		mRecentTasks.setParameters(-1 /* min /, 4 / max /, -1 / ms */);

		Task invisibleExcludedTask = createTaskBuilder(".ExcludedTask1")
		@@ -816,18 +789,7 @@ public class RecentTasksTest extends WindowTestsBase {
		}

		@Test
		@DisableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)
		public void testVisibleTasks_excludedFromRecents_firstTaskNotVisible() {
		testVisibleTasks_excludedFromRecents_firstTaskNotVisible_internal();
		}

		@Test
		@EnableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)
		public void testVisibleTasks_excludedFromRecents_firstTaskNotVisible_withRefactorFlag() {
		testVisibleTasks_excludedFromRecents_firstTaskNotVisible_internal();
		}

		private void testVisibleTasks_excludedFromRecents_firstTaskNotVisible_internal() {
		// Create some set of tasks, some of which are visible and some are not
		Task homeTask = createTaskBuilder("com.android.pkg1", ".HomeTask")
		.setParentTask(mTaskContainer.getRootHomeTask())