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

Commit 01a6af06 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Reduce the number of rotations of flicker tests" am: b6d051c2 am:... 

Merge "Reduce the number of rotations of flicker tests" am: b6d051c2 am: 77f78806 am: 425a9714

Change-Id: Ie7551934d419d5c9ca102e0b5b86f28a7c8f2b97
parents e1422db2 425a9714

tests/FlickerTests/src/com/android/server/wm/flicker/ChangeAppRotationTest.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class ChangeAppRotationTest extends FlickerTestBase { 
    @Parameters(name = "{0}-{1}")

    public static Collection<Object[]> getParams() {

        int[] supportedRotations =

                {Surface.ROTATION_0, Surface.ROTATION_90, Surface.ROTATION_270};

                {Surface.ROTATION_0, Surface.ROTATION_90};

        Collection<Object[]> params = new ArrayList<>();

        for (int begin : supportedRotations) {

            for (int end : supportedRotations) {

tests/FlickerTests/src/com/android/server/wm/flicker/SeamlessAppRotationTest.java

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class SeamlessAppRotationTest extends FlickerTestBase { 
    @Parameters(name = "{0}")

    public static Collection<Object[]> getParams() {

        int[] supportedRotations =

                {Surface.ROTATION_0, Surface.ROTATION_90, Surface.ROTATION_270};

                {Surface.ROTATION_0, Surface.ROTATION_90};

        Collection<Object[]> params = new ArrayList<>();



        ArrayList<Intent> testIntents = new ArrayList<>();
@@ -112,7 +112,7 @@ public class SeamlessAppRotationTest extends FlickerTestBase { 


        super.runTransition(

                changeAppRotation(mIntent, intentId, InstrumentationRegistry.getContext(),

                        mUiDevice, mBeginRotation, mEndRotation).repeat(5).build());

                        mUiDevice, mBeginRotation, mEndRotation).build());

    }



    @Test