commit 8348740987f0d236794e1c061fa7cd4e79f43bd8
author Jorim Jaggi <jjaggi@google.com> Tue Jun 12 15:14:25 2018 +0200
committer Jorim Jaggi <jjaggi@google.com> Tue Jun 12 15:55:40 2018 +0200
tree b0ea76af2e14b7acc8bb8c820440a6f189b6ca9f
parent 200e6be61cbfef29c817c2fe449a66b2ae4251bb

Wait for home to be visible

Test: self
Change-Id: Ife2561f079234d4060ac00f4ae8bd2bb12a5db5b
Fixes: 110033220

tests/framework/base/activitymanager/src/android/server/am/ActivityManagerSplitScreenTests.java

diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerSplitScreenTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerSplitScreenTests.java
index c1c3cf0..ae483d8 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerSplitScreenTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerSplitScreenTests.java
@@ -468,8 +468,8 @@
         // Rotate the screen to check that minimize, unminimize, dismiss the docked stack and then
         // going home has the correct app transition
         try (final RotationSession rotationSession = new RotationSession()) {
-            for (int i = 0; i < 4; i++) {
-                rotationSession.set(i);
+            for (int rotation = ROTATION_0; rotation <= ROTATION_270; rotation++) {
+                rotationSession.set(rotation);
                 launchActivityInDockStackAndMinimize(DOCKED_ACTIVITY);
 
                 if (mIsHomeRecentsComponent) {
@@ -491,7 +491,8 @@
                 assertNotEquals(
                         TRANSIT_WALLPAPER_OPEN, mAmWmState.getWmState().getLastTransition());
                 pressHomeButton();
-                mAmWmState.computeState(true);
+                mAmWmState.waitForHomeActivityVisible();
+
                 assertEquals(TRANSIT_WALLPAPER_OPEN, mAmWmState.getWmState().getLastTransition());
             }
         }