commit ff9e828c1c538d7bf5be65ba42f1b2f265a6b1a7
author Riddle Hsu <riddlehsu@google.com> Wed Apr 24 23:55:11 2019 +0800
committer Riddle Hsu <riddlehsu@google.com> Wed May 01 00:52:47 2019 +0800
tree 699e4e8defe1c2cd0a6e4fe1e6cb8ee68e65b9f5
parent 296152392f3f5851dd0d94a959a30989e9dc1463

Don't launch ResolverActivity in home stack

Otherwise if the foreground is standard type activity, when finishing
ResolverActivity without choosing to use which home, the current home
is still brought to front.

Bug: 131589476
Test: atest RootActivityContainerTests#testStartResolverActivityForHome
Change-Id: Idca08856de489bd62c90bc75ed37d5a379ae74ce

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

diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
index 45d5219..a9807fb 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
@@ -79,7 +79,6 @@
 import androidx.test.filters.SmallTest;
 
 import com.android.server.wm.LaunchParamsController.LaunchParamsModifier;
-import com.android.server.wm.TaskRecord.TaskRecordFactory;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -330,21 +329,14 @@
                 any(), any(), any(), anyInt(), anyInt(), anyInt(), any(),
                 anyBoolean(), anyBoolean(), any(), any(), any());
 
-        // instrument the stack and task used.
-        final ActivityStack stack = mRootActivityContainer.getDefaultDisplay().createStack(
-                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */);
-        final TaskRecord task = new TaskBuilder(mSupervisor)
-                .setCreateStack(false)
-                .build();
-
-        // use factory that only returns spy task.
-        final TaskRecordFactory factory = mock(TaskRecordFactory.class);
-        TaskRecord.setTaskRecordFactory(factory);
-
-        // return task when created.
-        doReturn(task).when(factory).create(any(), anyInt(), any(), any(), any(), any());
+        // Use factory that only returns spy task.
+        mockTaskRecordFactory();
 
         if (mockGetLaunchStack) {
+            // Instrument the stack and task used.
+            final ActivityStack stack = mRootActivityContainer.getDefaultDisplay().createStack(
+                    WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */);
+
             // Direct starter to use spy stack.
             doReturn(stack).when(mRootActivityContainer)
                     .getLaunchStack(any(), any(), any(), anyBoolean());