commit 5c79b90367403eade93d08bf9470e319e8b4e936
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 18 22:02:33 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 18 22:02:33 2018 +0000
tree 64fab77de7bd3f787d6e7daa1738914e6da34355
parent 5934c0131f3d1bd15db5cedfa964bf50de673051
parent 8bd53eb5fb5ae19716ea01fc7a59484da95c8706

Merge "Revert "DO NOT MERGE: Make the tests permissive for OMR1"" into oreo-mr1-cts-dev

hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java

diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
index 518fb00..011390a 100644
--- a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
+++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
@@ -433,7 +433,7 @@
             // Go home and check the app transition
             assertNotSame(TRANSIT_WALLPAPER_OPEN, mAmWmState.getWmState().getLastTransition());
             pressHomeButton();
-            mAmWmState.waitForHomeActivityVisible(mDevice);
+            mAmWmState.computeState(mDevice, null);
             assertEquals(TRANSIT_WALLPAPER_OPEN, mAmWmState.getWmState().getLastTransition());
         }
     }