Merge "Notify task stack changed when the transient launch committed"
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index 216544a..4e41da0 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -813,6 +813,7 @@
}
boolean hasParticipatedDisplay = false;
+ boolean reportTaskStackChanged = false;
// Commit all going-invisible containers
for (int i = 0; i < mParticipants.size(); ++i) {
final WindowContainer<?> participant = mParticipants.valueAt(i);
@@ -855,6 +856,8 @@
&& ar.isVisible()) {
// Transient launch was committed, so report enteringAnimation
ar.mEnteringAnimation = true;
+ reportTaskStackChanged = true;
+
// Since transient launches don't automatically take focus, make sure we
// synchronize focus since we committed to the launch.
if (ar.isTopRunningActivity()) {
@@ -877,6 +880,11 @@
}
}
}
+
+ if (reportTaskStackChanged) {
+ mController.mAtm.getTaskChangeNotificationController().notifyTaskStackChanged();
+ }
+
// dispatch legacy callback in a different loop. This is because multiple legacy handlers
// (fixed-rotation/displaycontent) make global changes, so we want to ensure that we've
// processed all the participants first (in particular, we want to trigger pip-enter first)