commit bebd8cd9d5a2d836078590ff663063ec4ff29b08
author Wale Ogunwale <ogunwale@google.com> Mon Oct 28 15:53:31 2019 -0700
committer Wale Ogunwale <ogunwale@google.com> Sun Nov 10 06:44:41 2019 -0800
tree e9b0100b8c6ecebe4ba45512b1534b822e9a53c0
parent d7c8835b8630eebd174ccd9f3165ed8783939856

Merge Stack level of window hierarchy (63/n)

Bug: 80414790
Test: Existing tests pass
Change-Id: Ia6765f7ebd89b38e0d2b88ed1cdfec5b386a0774

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
index bd137fb..ab9a7ca 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java
@@ -235,7 +235,7 @@
         final DisplayContent dc = createNewDisplay();
 
         // Add stack with activity.
-        final TaskStack stack = createTaskStackOnDisplay(dc);
+        final ActivityStack stack = createTaskStackOnDisplay(dc);
         assertEquals(dc.getDisplayId(), stack.getDisplayContent().getDisplayId());
         assertEquals(dc, stack.getParent().getParent());
         assertEquals(dc, stack.getDisplayContent());
@@ -311,7 +311,7 @@
         final DisplayContent dc1 = createNewDisplay();
 
         // Add stack with activity.
-        final TaskStack stack0 = createTaskStackOnDisplay(dc0);
+        final ActivityStack stack0 = createTaskStackOnDisplay(dc0);
         final Task task0 = createTaskInStack(stack0, 0 /* userId */);
         final ActivityRecord activity =
                 WindowTestUtils.createTestActivityRecord(dc0);
@@ -319,7 +319,7 @@
         dc0.configureDisplayPolicy();
         assertNotNull(dc0.mTapDetector);
 
-        final TaskStack stack1 = createTaskStackOnDisplay(dc1);
+        final ActivityStack stack1 = createTaskStackOnDisplay(dc1);
         final Task task1 = createTaskInStack(stack1, 0 /* userId */);
         final ActivityRecord activity1 =
                 WindowTestUtils.createTestActivityRecord(dc0);