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
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
index 3eed0b7..302ad7f 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
@@ -2719,6 +2719,9 @@
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);
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
index 62de67a..ba3b02a 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
@@ -963,6 +963,8 @@
* @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);