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

Commit 9c4fe474 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make precondition of fixed orientation tests consistent" into main

parents 101ae347 f10028ac

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

+2 −0
Original line number Diff line number Diff line
@@ -1762,6 +1762,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        spyOn(mWm.mAppCompatConfiguration);

        doReturn(false).when(mWm.mAppCompatConfiguration).isTranslucentLetterboxingEnabled();

        makeDisplayPortrait(mDisplayContent);

        mDisplayContent.setIgnoreOrientationRequest(false);

        final ActivityRecord nonTopVisible = new ActivityBuilder(mAtm)

                .setScreenOrientation(SCREEN_ORIENTATION_PORTRAIT)

                .setCreateTask(true).build();
@@ -1809,6 +1810,7 @@ public class DisplayContentTests extends WindowTestsBase { 
        doReturn(false).when(mWm.mAppCompatConfiguration).isTranslucentLetterboxingEnabled();

        setReverseDefaultRotation(mDisplayContent, false);

        makeDisplayPortrait(mDisplayContent);

        mDisplayContent.setIgnoreOrientationRequest(false);

        final ActivityRecord nonTopVisible = new ActivityBuilder(mAtm).setCreateTask(true)

                .setScreenOrientation(SCREEN_ORIENTATION_LANDSCAPE).setVisible(false).build();

        new ActivityBuilder(mAtm).setCreateTask(true)