Merge "Fix test of wait-for-window-on-boot if wallpaper is disabled"

2020-10-07 06:26:51 +00:00
parent 687936786d fb2bf07f91
commit faf7e4a05b
1 changed files with 2 additions and 1 deletions
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
@@ -526,7 +526,8 @@ public class DisplayContentTests extends WindowTestsBase {
        for (int i = 0; i < types.length; i++) {
            final int type = types[i];
            windows[i] = createWindow(null /* parent */, type, displayContent, "window-" + type);
-            windows[i].mHasSurface = false;
+            windows[i].setHasSurface(true);
+            windows[i].mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
        }
        return windows;
    }