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

Commit 1332beac authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Add tests for VR preferred display id calculation"

parents 86d0d9d8 e60d55b1

services/tests/servicestests/src/com/android/server/am/LaunchParamsControllerTests.java

+31 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
package com.android.server.am;



import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.INVALID_DISPLAY;



import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_CONTINUE;

import static com.android.server.am.LaunchParamsController.LaunchParamsModifier.RESULT_DONE;
@@ -188,6 +190,35 @@ public class LaunchParamsControllerTests extends ActivityTestsBase { 
        assertEquals(result, positioner2.getLaunchParams());

    }



    /**

     * Tests preferred display id calculation for VR.

     */

    @Test

    public void testVrPreferredDisplay() {

        final int vr2dDisplayId = 1;

        mService.mVr2dDisplayId = vr2dDisplayId;



        final LaunchParams result = new LaunchParams();

        final ActivityRecord vrActivity = new ActivityBuilder(mService).build();

        vrActivity.requestedVrComponent = vrActivity.realActivity;



        // VR activities should always land on default display.

        mController.calculate(null /*task*/, null /*layout*/, vrActivity /*activity*/,

                null /*source*/, null /*options*/, result);

        assertEquals(DEFAULT_DISPLAY, result.mPreferredDisplayId);



        // Otherwise, always lands on VR 2D display.

        final ActivityRecord vr2dActivity = new ActivityBuilder(mService).build();

        mController.calculate(null /*task*/, null /*layout*/, vr2dActivity /*activity*/,

                null /*source*/, null /*options*/, result);

        assertEquals(vr2dDisplayId, result.mPreferredDisplayId);

        mController.calculate(null /*task*/, null /*layout*/, null /*activity*/, null /*source*/,

                null /*options*/, result);

        assertEquals(vr2dDisplayId, result.mPreferredDisplayId);



        mService.mVr2dDisplayId = INVALID_DISPLAY;

    }



    /**

     * Ensures that {@link LaunchParamsModifier} requests specifying display id during

     * layout are honored.