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

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

Merge "Fix testRespectTopFullscreenOrientation failed on tablet" into main

parents 7920f3ad 4187972d

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);