Merge "Compare containers in mChangingContainers with Task for change transitions" into rvc-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wm/RemoteAnimationController.java b/services/core/java/com/android/server/wm/RemoteAnimationController.java
index c02e0a11a0c5..c7f78342c829 100644
--- a/services/core/java/com/android/server/wm/RemoteAnimationController.java
+++ b/services/core/java/com/android/server/wm/RemoteAnimationController.java
@@ -387,9 +387,11 @@ class RemoteAnimationController implements DeathRecipient {
         int getMode() {
             final DisplayContent dc = mWindowContainer.getDisplayContent();
             final ActivityRecord topActivity = mWindowContainer.getTopMostActivity();
+            // Note that opening/closing transitions are per-activity while changing transitions
+            // are per-task.
             if (dc.mOpeningApps.contains(topActivity)) {
                 return RemoteAnimationTarget.MODE_OPENING;
-            } else if (dc.mChangingContainers.contains(topActivity)) {
+            } else if (dc.mChangingContainers.contains(mWindowContainer)) {
                 return RemoteAnimationTarget.MODE_CHANGING;
             } else {
                 return RemoteAnimationTarget.MODE_CLOSING;