diff options
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java | 4 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java b/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java index 6305bb621bc8..961f55ee3b44 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java @@ -116,8 +116,8 @@ public class WallpaperControllerTests extends WindowTestsBase { public void testWallpaperSizeWithFixedTransform() { // No wallpaper final DisplayContent dc = mDisplayContent; - if (dc.mBaseDisplayHeight == dc.mBaseDisplayWidth) { - // Make sure the size is different when changing orientation. + if (dc.mBaseDisplayHeight <= dc.mBaseDisplayWidth) { + // Make sure the display size is portrait. resizeDisplay(dc, 500, 1000); } 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 62de67a165c5..c3e67bbca50f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java +++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java @@ -971,6 +971,7 @@ class WindowTestsBase extends SystemServiceTestsBase { static void resizeDisplay(DisplayContent displayContent, int width, int height) { displayContent.updateBaseDisplayMetrics(width, height, displayContent.mBaseDisplayDensity, displayContent.mBaseDisplayPhysicalXDpi, displayContent.mBaseDisplayPhysicalYDpi); + displayContent.getDisplayRotation().configure(width, height); final Configuration c = new Configuration(); displayContent.computeScreenConfiguration(c); displayContent.onRequestedOverrideConfigurationChanged(c); |