Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7c072f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ifecc9cf5,I09d6ce2c 

* changes:
  Renamed WmServiceUtils.java to TestSystemServices.java
  Remove createActivityTaskManagerService and setupActivityTaskManagerService
parents c7641deb 6bec0b4f

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

+0 −5
Original line number Diff line number Diff line
@@ -57,11 +57,6 @@ import org.junit.Test; 
@Presubmit

public class ActivityDisplayTests extends ActivityTestsBase {



    @Before

    public void setUp() throws Exception {

        setupActivityTaskManagerService();

    }



    @Test

    public void testLastFocusedStackIsUpdatedWhenMovingStack() {

        // Create a stack at bottom.

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

+0 −2
Original line number Diff line number Diff line
@@ -70,8 +70,6 @@ public class ActivityMetricsLaunchObserverTests extends ActivityTestsBase { 


    @Before

    public void setUpAMLO() throws Exception {

        setupActivityTaskManagerService();



        mLaunchObserver = mock(ActivityMetricsLaunchObserver.class);



        // ActivityStackSupervisor always creates its own instance of ActivityMetricsLogger.

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

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ public class ActivityRecordTests extends ActivityTestsBase { 


    @Before

    public void setUp() throws Exception {

        setupActivityTaskManagerService();

        mStack = (TestActivityStack) new StackBuilder(mRootActivityContainer).build();

        mTask = mStack.getChildAt(0);

        mActivity = mTask.getTopActivity();

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

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ public class ActivityStackSupervisorTests extends ActivityTestsBase { 


    @Before

    public void setUp() throws Exception {

        setupActivityTaskManagerService();

        mFullscreenStack = mRootActivityContainer.getDefaultDisplay().createStack(

                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, true /* onTop */);

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ public class ActivityStackTests extends ActivityTestsBase { 


    @Before

    public void setUp() throws Exception {

        setupActivityTaskManagerService();

        mDefaultDisplay = mRootActivityContainer.getDefaultDisplay();

        mStack = spy(mDefaultDisplay.createStack(WINDOWING_MODE_UNDEFINED, ACTIVITY_TYPE_STANDARD,

                true /* onTop */));