From d3ce2736122c8ff89838d316d7d419c0a7ae59ce Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Tue, 25 Apr 2023 09:29:53 -0700
Subject: [PATCH] Fix track-assignment omission

Forgot to record the track so they sometimes didn't align if
there was a race with finish-transition.

Bug: 279523063
Test: com.android.wm.shell.flicker.splitscreen.SwitchBetweenSplitPairs#cujCompleted
Change-Id: I299f9665395ea146640f213c248d685c8e97b511
---
 .../core/java/com/android/server/wm/TransitionController.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java
index 8af037be8d06a..bcba7f3459c70 100644
--- a/services/core/java/com/android/server/wm/TransitionController.java
+++ b/services/core/java/com/android/server/wm/TransitionController.java
@@ -963,6 +963,7 @@ class TransitionController {
         if (sync) {
             info.setFlags(info.getFlags() | TransitionInfo.FLAG_SYNC);
         }
+        transition.mAnimationTrack = track;
         info.setTrack(track);
         mTrackCount = Math.max(mTrackCount, track + 1);
     }