commit 0b3d29240fc6541b30d3b2802b3f617f5f765a9e
author Wale Ogunwale <ogunwale@google.com> Mon Dec 30 08:55:07 2019 -0800
committer Louis Chang <louischang@google.com> Fri Jan 03 23:53:19 2020 +0800
tree 357dd9f14bbc112ee2d63c48bf8bf8b3b2fba3cf
parent 5afe2b6b27e190f5fed0ffb3323fb013ab282712

Pre-cleanup before unifying Task and Stack (82/n)

- Removed Task#getTaskStack() and Task#mStack. Changed callers to use getStack().
- Made ActivityStack#mDisplayId private and changed callers to use getDisplayId.
- Switch stack id assignment to use getNextTaskIdForUser() so there isn't dups. with the ids.
- Made ActivityRecord#mTaskOverlay private.

Bug: 80414790
Test: Existing tests pass.
Change-Id: I47716f1fdac4cab21eed5a69f91e765f070e7550

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

diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
index 6c3410a..b4f5751 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskStackTests.java
@@ -110,12 +110,12 @@
     public void testStackRemoveImmediately() {
         final ActivityStack stack = createTaskStackOnDisplay(mDisplayContent);
         final Task task = createTaskInStack(stack, 0 /* userId */);
-        assertEquals(stack, task.getTaskStack());
+        assertEquals(stack, task.getStack());
 
         // Remove stack and check if its child is also removed.
         stack.removeImmediately();
         assertNull(stack.getDisplayContent());
-        assertNull(task.getTaskStack());
+        assertNull(task.getStack());
     }
 
     @Test
@@ -131,7 +131,7 @@
         assertEquals(0, stack.getChildCount());
         assertNull(stack.getDisplayContent());
         assertNull(task.getDisplayContent());
-        assertNull(task.getTaskStack());
+        assertNull(task.getStack());
     }
 
     @Test