Add task-id to animation leash

This was removed by an earlier CL because we thought it
wasn't needed, but since snapshots have moved up one level
(sibling of task), it turns out that this is still needed
so adding it back.

Bug: 151881448
Test: do a transition and see taskid in surface trace
Change-Id: I4b48447f7d235e9828ac886f23a567668f1184cd

1 files changed, 5 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 31897057e076..48609e17ba40 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -3164,6 +3164,11 @@ class Task extends WindowContainer<WindowContainer> {
     }
 
     @Override
+    public SurfaceControl.Builder makeAnimationLeash() {
+        return super.makeAnimationLeash().setMetadata(METADATA_TASK_ID, mTaskId);
+    }
+
+    @Override
     public SurfaceControl getAnimationLeashParent() {
         if (WindowManagerService.sHierarchicalAnimations) {
             return super.getAnimationLeashParent();