commit c4a3b3551de1c7a414fe55b671c1968c18cc0d9f
author Yuncheol Heo <ycheo@google.com> Thu Jun 18 16:31:42 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 18 16:31:42 2020 +0000
tree 5bf26fc0a981f0b54fb5f5d4c04142f8630e5c08
parent 1731b41a1bf07dd0e80564fe8bc2e589924e8d6b
parent 66d1611502f92440398b82c7692f06cac59fe4b0

Merge "Fix SplashscreenTests#testSplashscreenContent in the multi display env." into rvc-dev

tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java b/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java
index 1863487..0fc4bc8 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java
@@ -16,6 +16,7 @@
 
 package android.server.wm;
 
+import static android.server.wm.WindowManagerState.STATE_RESUMED;
 import static android.server.wm.app.Components.SPLASHSCREEN_ACTIVITY;
 import static android.view.Display.DEFAULT_DISPLAY;
 
@@ -53,6 +54,8 @@
     @Test
     public void testSplashscreenContent() {
         launchActivityNoWait(SPLASHSCREEN_ACTIVITY);
+        // Activity may not be launched yet even if app transition is in idle state.
+        mWmState.waitForActivityState(SPLASHSCREEN_ACTIVITY, STATE_RESUMED);
         mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         mWmState.getStableBounds();
         final Bitmap image = takeScreenshot();