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/WindowTestUtils.java

diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
index 3f32e33..11dc1ba 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
@@ -17,12 +17,10 @@
 package com.android.server.wm;
 
 import static android.app.AppOpsManager.OP_NONE;
-import static android.content.pm.ActivityInfo.RESIZE_MODE_UNRESIZEABLE;
 
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;
 import static com.android.server.wm.WindowContainer.POSITION_TOP;
 
-import android.app.ActivityManager;
 import android.os.IBinder;
 import android.view.IWindow;
 import android.view.WindowManager;
@@ -34,13 +32,13 @@
  */
 class WindowTestUtils {
 
-    /** Creates a {@link Task} and adds it to the specified {@link TaskStack}. */
-    static Task createTaskInStack(WindowManagerService service, TaskStack stack, int userId) {
+    /** Creates a {@link Task} and adds it to the specified {@link ActivityStack}. */
+    static Task createTaskInStack(WindowManagerService service, ActivityStack stack, int userId) {
         synchronized (service.mGlobalLock) {
             final TaskRecord task = new ActivityTestsBase.TaskBuilder(
-                    stack.mActivityStack.mStackSupervisor)
+                    stack.mStackSupervisor)
                     .setUserId(userId)
-                    .setStack(stack.mActivityStack)
+                    .setStack(stack)
                     .build();
             return task;
         }
@@ -60,7 +58,7 @@
                     .setStack(stack)
                     .setCreateTask(true)
                     .build();
-            postCreateActivitySetup(activity, stack.mTaskStack.getDisplayContent());
+            postCreateActivitySetup(activity, stack.getDisplayContent());
             return activity;
         }
     }