commit 705e41904fd986de643b1924fd7edc95b5645cc4
author Louis Chang <louischang@google.com> Wed Aug 16 10:29:08 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 16 10:29:08 2023 +0000
tree 033f0165aaa197b396d36c77063833f054c9e9ae
parent 605810e10acf7eb491849e79192a4db7c1d652e5
parent f61e13b8b47eed2875ee25cd00ed2ee59860ed62

Merge "Fix activity minWidth/minHeight policy unit test" into main

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

diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
index 4290f4b..d169a58 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java
@@ -490,6 +490,11 @@
                 .build();
         final Task task = activity.getTask();
         final TaskDisplayArea tda = task.getDisplayArea();
+        // Ensure the display is not a large screen
+        if (tda.getConfiguration().smallestScreenWidthDp
+                >= WindowManager.LARGE_SCREEN_SMALLEST_SCREEN_WIDTH_DP) {
+            resizeDisplay(activity.mDisplayContent, 500, 800);
+        }
 
         // Ignore the activity min width/height for determine multi window eligibility.
         mAtm.mRespectsActivityMinWidthHeightMultiWindow = -1;