commit a81092e997ba6985da9491b81234e1bd9bb4ec80
author Grigory Dzhavadyan <grigoryj@google.com> Sat Nov 19 02:39:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Nov 19 02:39:19 2016 +0000
tree edf3e4a96b32035ea73db7e787994ea724953bb2
parent 49a5073df4f18e5d7f1d8ea50ba58238b6190a0d
parent 4643ab6f73696725a773d77872ff9792ca22f9d1

Fix build for nyc-dr1-dev
am: 4643ab6f73

Change-Id: I19d1bdfeff2f4d74c7aa513e9b6fff4283ac768b

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

diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
index 268893d..ec0b7b0 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
@@ -83,7 +83,7 @@
         launchActivityInDockStack(LAUNCHING_ACTIVITY);
         final String[] waitForFirstVisible = new String[] {TEST_ACTIVITY_NAME};
         final String[] waitForSecondVisible = new String[] {NO_RELAUNCH_ACTIVITY_NAME};
-        mAmWmState.computeState(mDevice, new String[] {LAUNCH_TO_SIDE_ACTIVITY_NAME});
+        mAmWmState.computeState(mDevice, new String[] {LAUNCHING_ACTIVITY});
 
         // Launch activity to side.
         launchActivityToSide();
@@ -256,7 +256,7 @@
         // Rotate device single steps (90°) 0-1-2-3.
         // Each time we compute the state we implicitly assert valid bounds.
         String[] waitForActivitiesVisible =
-            new String[] {LAUNCH_TO_SIDE_ACTIVITY_NAME, TEST_ACTIVITY_NAME};
+            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
         setDeviceRotation(0);
         mAmWmState.computeState(mDevice, waitForActivitiesVisible);
         setDeviceRotation(1);
@@ -295,7 +295,7 @@
         mAmWmState.assertContainsStack("Must contain docked stack.", DOCKED_STACK_ID);
 
         String[] waitForActivitiesVisible =
-            new String[] {LAUNCH_TO_SIDE_ACTIVITY_NAME, TEST_ACTIVITY_NAME};
+            new String[] {LAUNCHING_ACTIVITY, TEST_ACTIVITY_NAME};
         lockDevice();
         setDeviceRotation(0);
         unlockDevice();