| commit | efd22ea6c416f758990adaa102b8e359a4e21aca | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 17 01:57:02 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Jan 17 01:57:02 2018 +0000 |
| tree | a6381716062b69c33021b8a58cb7c51bc6143266 | |
| parent | a829d563297c4db19a240b198c33bb9dc7532ef4 [diff] | |
| parent | 633619e57698d3ea41441b57d0c622486bdafa40 [diff] |
Merge "DO NOT MERGE: Fix the display id for testNewTaskSameDisplay" into oreo-cts-dev
diff --git a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTests.java b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTests.java index 4905436..9b701eb 100644 --- a/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTests.java +++ b/hostsidetests/services/activityandwindowmanager/activitymanager/src/android/server/cts/ActivityManagerDisplayTests.java
@@ -1340,7 +1340,8 @@ + "--ez new_task true --es target_activity " + LAUNCHING_ACTIVITY); // Check that the third activity ends up in a new task in the same stack as the - // first activity + // first activity (the display should be newDisplay.mDisplayId). + displayId = mVrHeadset ? mVrVirtualDisplayId : newDisplay.mDisplayId; mAmWmState.waitForValidState(mDevice, new String[] {LAUNCHING_ACTIVITY}, null /* stackIds */, false /* compareTaskAndStackBounds */, componentName);