Consolidate TaskDisplayArea#addStack and TaskDisplayArea#addChild
When closing an app by swiping up, launcher runs a remote animation
on the home task and the closing app task. If the most recent running
task (via ATMS#getFilteredTasks) does not match the remote animation
target task then the animation is not run and we see a flicker.
When dismissing split screen, the recency of the primary split screen
task is not updated. Fix this by eliminating two different code paths
to add a child to TaskDisplayArea and ensure we update
TaskDisplayArea#mPreferredTopFocusableStack.
Test: swipe up to dismiss app after exiting split-screen
Test: go/wm-smoke
Fixes: 153583420
Change-Id: I592199d95f3f2ae56ad5ff638612cb63a3549602
diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
index d71e561..0722b8e 100644
--- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
+++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
@@ -266,16 +266,14 @@
@Override
void addChild(ActivityStack stack, int position) {
+ if (DEBUG_STACK) Slog.d(TAG_WM, "Set stack=" + stack + " on taskDisplayArea=" + this);
addStackReferenceIfNeeded(stack);
position = findPositionForStack(position, stack, true /* adding */);
super.addChild(stack, position);
mAtmService.updateSleepIfNeededLocked();
- // The reparenting case is handled in WindowContainer.
- if (!stack.mReparenting) {
- mDisplayContent.setLayoutNeeded();
- }
+ positionStackAt(stack, position);
}
@Override
@@ -637,12 +635,6 @@
}
}
- void addStack(ActivityStack stack, int position) {
- if (DEBUG_STACK) Slog.d(TAG_WM, "Set stack=" + stack + " on taskDisplayArea=" + this);
- addChild(stack, position);
- positionStackAt(stack, position);
- }
-
void onStackRemoved(ActivityStack stack) {
if (ActivityTaskManagerDebugConfig.DEBUG_STACK) {
Slog.v(TAG_STACK, "removeStack: detaching " + stack + " from displayId="
@@ -786,7 +778,7 @@
}
} else if (stack.getDisplayArea() != this || !stack.isRootTask()) {
if (stack.getParent() == null) {
- addStack(stack, position);
+ addChild(stack, position);
} else {
stack.reparent(this, onTop);
}
@@ -942,7 +934,7 @@
positionStackAtTop((ActivityStack) launchRootTask, false /* includingParents */);
}
} else {
- addStack(stack, onTop ? POSITION_TOP : POSITION_BOTTOM);
+ addChild(stack, onTop ? POSITION_TOP : POSITION_BOTTOM);
stack.setWindowingMode(windowingMode, true /* creating */);
}
return stack;