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

Commit 4187972d authored by Louis Chang's avatar Louis Chang
Browse files

Fix testRespectTopFullscreenOrientation failed on tablet 

The test failed on tablet and foldable devices because the devices
are in landscape mode by default. Once the activity in the test
updates the orientation to portrait, the display will be in transition
mode and unable to update the next orientation request.

Bug: 295866346
Test: atest ActivityRecordTests
Change-Id: I2d7e080418f893b8a839b9427f19682bf2f32228
parent 0d4e74d5

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

+3 −0
Original line number Diff line number Diff line
@@ -2719,6 +2719,9 @@ public class ActivityRecordTests extends WindowTestsBase { 
        assertEquals(Configuration.ORIENTATION_PORTRAIT, displayConfig.orientation);

        assertEquals(Configuration.ORIENTATION_PORTRAIT, activityConfig.orientation);



        // Unblock the rotation animation, so the further orientation updates won't be ignored.

        unblockDisplayRotation(activity.mDisplayContent);



        final ActivityRecord topActivity = createActivityRecord(activity.getTask());

        topActivity.setOrientation(SCREEN_ORIENTATION_LANDSCAPE);

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

+2 −0
Original line number Diff line number Diff line
@@ -963,6 +963,8 @@ class WindowTestsBase extends SystemServiceTestsBase { 
     * @see DisplayRotation#updateRotationUnchecked

     */

    void unblockDisplayRotation(DisplayContent dc) {

        dc.mOpeningApps.clear();

        mWm.mAppsFreezingScreen = 0;

        mWm.stopFreezingDisplayLocked();

        // The rotation animation won't actually play, it needs to be cleared manually.

        dc.setRotationAnimation(null);