From ba0b2fa370e674ebbe0ac055eb9a95df7d338013 Mon Sep 17 00:00:00 2001 From: Mariia Sandrikova Date: Sun, 22 Jan 2023 14:39:38 +0000 Subject: [PATCH] Fix WmTests for devices with ro.bootanim.set_orientation_ Fix: 265771023 Test: atest WmTests Change-Id: Ia4826510181e50db26fccfe75275572e3b5577bf --- .../src/com/android/server/wm/TestDisplayContent.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java b/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java index d31ae6aeb42ae..83be4f0ac20b4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java +++ b/services/tests/wmtests/src/com/android/server/wm/TestDisplayContent.java @@ -18,6 +18,7 @@ package com.android.server.wm; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; import static android.view.DisplayAdjustments.DEFAULT_DISPLAY_ADJUSTMENTS; +import static android.view.Surface.ROTATION_0; import static android.view.WindowManagerPolicyConstants.NAV_BAR_BOTTOM; import static com.android.dx.mockito.inline.extended.ExtendedMockito.any; @@ -78,6 +79,12 @@ class TestDisplayContent extends DisplayContent { final InputMonitor inputMonitor = getInputMonitor(); spyOn(inputMonitor); doNothing().when(inputMonitor).resumeDispatchingLw(any()); + + // For devices that set the sysprop ro.bootanim.set_orientation_ + // See DisplayRotation#readDefaultDisplayRotation for context. + // Without that, meaning of height and width in context of the tests can be swapped if + // the default rotation is 90 or 270. + displayRotation.setRotation(ROTATION_0); } public static class Builder {