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

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

Merge "Convert TestActivityDisplay.create to Builder"

parents d9f8512f 4a51dbc0

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

+2 −3
Original line number Diff line number Diff line
@@ -134,10 +134,9 @@ public class ActivityDisplayTests extends ActivityTestsBase { 
    public void testNotResumeHomeStackOnRemovingDisplay() {

        // Create a display which supports system decoration and allows reparenting stacks to

        // another display when the display is removed.

        final ActivityDisplay display = createNewActivityDisplay();

        final ActivityDisplay display = new TestActivityDisplay.Builder(

                mService, 1000, 1500).setSystemDecorations(true).build();

        doReturn(false).when(display).shouldDestroyContentOnRemove();

        doReturn(true).when(display).supportsSystemDecorations();

        mRootActivityContainer.addChild(display, ActivityDisplay.POSITION_TOP);



        // Put home stack on the display.

        final ActivityStack homeStack = new StackBuilder(mRootActivityContainer)

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

+5 −3
Original line number Diff line number Diff line
@@ -760,8 +760,9 @@ public class ActivityStarterTests extends ActivityTestsBase { 
                false /* mockGetLaunchStack */);



        // Create a secondary display at bottom.

        final TestActivityDisplay secondaryDisplay = createNewActivityDisplay();

        mRootActivityContainer.addChild(secondaryDisplay, POSITION_BOTTOM);

        final TestActivityDisplay secondaryDisplay =

                new TestActivityDisplay.Builder(mService, 1000, 1500)

                        .setPosition(POSITION_BOTTOM).build();

        final ActivityStack stack = secondaryDisplay.createStack(WINDOWING_MODE_FULLSCREEN,

                ACTIVITY_TYPE_STANDARD, true /* onTop */);
@@ -798,7 +799,8 @@ public class ActivityStarterTests extends ActivityTestsBase { 
                false /* mockGetLaunchStack */);



        // Create a secondary display with an activity.

        final TestActivityDisplay secondaryDisplay = createNewActivityDisplay();

        final TestActivityDisplay secondaryDisplay =

                new TestActivityDisplay.Builder(mService, 1000, 1500).build();

        mRootActivityContainer.addChild(secondaryDisplay, POSITION_TOP);

        final ActivityRecord singleTaskActivity = createSingleTaskActivityOn(

                secondaryDisplay.createStack(WINDOWING_MODE_FULLSCREEN,

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

+1 −20
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.content.res.Configuration; 
import android.os.Build;

import android.os.UserHandle;

import android.service.voice.IVoiceInteractionSession;

import android.view.DisplayInfo;



import com.android.server.AttributeCache;
@@ -78,27 +77,9 @@ class ActivityTestsBase extends SystemServiceTestsBase { 
        mRootActivityContainer = mService.mRootActivityContainer;

    }



    /** Creates a {@link TestActivityDisplay}. */

    TestActivityDisplay createNewActivityDisplay() {

        return TestActivityDisplay.create(mSupervisor);

    }



    TestActivityDisplay createNewActivityDisplay(DisplayInfo info) {

        return TestActivityDisplay.create(mSupervisor, info);

    }



    /** Creates and adds a {@link TestActivityDisplay} to supervisor at the given position. */

    TestActivityDisplay addNewActivityDisplayAt(int position) {

        final TestActivityDisplay display = createNewActivityDisplay();

        mRootActivityContainer.addChild(display, position);

        return display;

    }



    /** Creates and adds a {@link TestActivityDisplay} to supervisor at the given position. */

    TestActivityDisplay addNewActivityDisplayAt(DisplayInfo info, int position) {

        final TestActivityDisplay display = createNewActivityDisplay(info);

        mRootActivityContainer.addChild(display, position);

        return display;

        return new TestActivityDisplay.Builder(mService, 1000, 1500).setPosition(position).build();

    }



    /** Sets the default minimum task size to 1 so that tests can use small task sizes */

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

+2 −6
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import android.content.pm.PackageManagerInternal; 
import android.graphics.Rect;

import android.os.UserHandle;

import android.platform.test.annotations.Presubmit;

import android.view.DisplayInfo;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.MediumTest;
@@ -103,11 +102,8 @@ public class LaunchParamsPersisterTests extends ActivityTestsBase { 
        deleteRecursively(mFolder);



        mDisplayUniqueId = "test:" + Integer.toString(sNextUniqueId++);

        final DisplayInfo info = new DisplayInfo();

        mService.mContext.getDisplay().getDisplayInfo(info);

        info.uniqueId = mDisplayUniqueId;

        mTestDisplay = createNewActivityDisplay(info);

        mRootActivityContainer.addChild(mTestDisplay, ActivityDisplay.POSITION_TOP);

        mTestDisplay = new TestActivityDisplay.Builder(mService, 1000, 1500)

                .setUniqueId(mDisplayUniqueId).build();

        when(mRootActivityContainer.getActivityDisplay(eq(mDisplayUniqueId)))

                .thenReturn(mTestDisplay);

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

+12 −17
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy; 
import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.times;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

import static com.android.server.wm.ActivityDisplay.POSITION_TOP;

import static com.android.server.wm.ActivityStackSupervisor.ON_TOP;

import static com.android.server.wm.RootActivityContainer.MATCH_TASK_IN_STACKS_OR_RECENT_TASKS_AND_RESTORE;
@@ -61,7 +60,6 @@ import android.content.res.Resources; 
import android.graphics.Rect;

import android.platform.test.annotations.Presubmit;

import android.util.Pair;

import android.view.DisplayInfo;



import androidx.test.filters.MediumTest;
@@ -518,9 +516,9 @@ public class RootActivityContainerTests extends ActivityTestsBase { 
        mockResolveSecondaryHomeActivity();



        // Create secondary displays.

        final TestActivityDisplay secondDisplay = createNewActivityDisplay();

        mRootActivityContainer.addChild(secondDisplay, POSITION_TOP);

        doReturn(true).when(secondDisplay).supportsSystemDecorations();

        final TestActivityDisplay secondDisplay =

                new TestActivityDisplay.Builder(mService, 1000, 1500)

                        .setSystemDecorations(true).build();



        doReturn(true).when(mRootActivityContainer)

                .ensureVisibilityAndConfig(any(), anyInt(), anyBoolean(), anyBoolean());
@@ -585,10 +583,10 @@ public class RootActivityContainerTests extends ActivityTestsBase { 
    @Test

    public void testStartSecondaryHomeOnDisplayWithUserKeyLocked() {

        // Create secondary displays.

        final TestActivityDisplay secondDisplay = createNewActivityDisplay();

        mRootActivityContainer.addChild(secondDisplay, POSITION_TOP);

        final TestActivityDisplay secondDisplay =

                new TestActivityDisplay.Builder(mService, 1000, 1500)

                        .setSystemDecorations(true).build();



        doReturn(true).when(secondDisplay).supportsSystemDecorations();

        // Use invalid user id to let StorageManager.isUserKeyUnlocked() return false.

        final int currentUser = mRootActivityContainer.mCurrentUser;

        mRootActivityContainer.mCurrentUser = -1;
@@ -611,9 +609,9 @@ public class RootActivityContainerTests extends ActivityTestsBase { 
    @Test

    public void testStartSecondaryHomeOnDisplayWithoutSysDecorations() {

        // Create secondary displays.

        final TestActivityDisplay secondDisplay = createNewActivityDisplay();

        mRootActivityContainer.addChild(secondDisplay, POSITION_TOP);

        doReturn(false).when(secondDisplay).supportsSystemDecorations();

        final TestActivityDisplay secondDisplay =

                new TestActivityDisplay.Builder(mService, 1000, 1500)

                        .setSystemDecorations(false).build();



        mRootActivityContainer.startHomeOnDisplay(0 /* userId */, "testStartSecondaryHome",

                secondDisplay.mDisplayId, true /* allowInstrumenting */, true /* fromHomeKey */);
@@ -834,12 +832,9 @@ public class RootActivityContainerTests extends ActivityTestsBase { 
    @Test

    public void testGetLaunchStackWithRealCallerId() {

        // Create a non-system owned virtual display.

        final DisplayInfo info = new DisplayInfo();

        mSupervisor.mService.mContext.getDisplay().getDisplayInfo(info);

        info.type = TYPE_VIRTUAL;

        info.ownerUid = 100;

        final TestActivityDisplay secondaryDisplay = TestActivityDisplay.create(mSupervisor, info);

        mRootActivityContainer.addChild(secondaryDisplay, POSITION_TOP);

        final TestActivityDisplay secondaryDisplay =

                new TestActivityDisplay.Builder(mService, 1000, 1500)

                        .setType(TYPE_VIRTUAL).setOwnerUid(100).build();



        // Create an activity with specify the original launch pid / uid.

        final ActivityRecord r = new ActivityBuilder(mService).setLaunchedFromPid(200)