Merge "Add task-id to animation leash" into rvc-dev

2020-06-04 20:48:04 +00:00
parent 3bf4ec139b fb89d1ab9b
commit 77542c73be
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -3163,6 +3163,11 @@ class Task extends WindowContainer<WindowContainer> {
        return false;
    }

+    @Override
+    public SurfaceControl.Builder makeAnimationLeash() {
+        return super.makeAnimationLeash().setMetadata(METADATA_TASK_ID, mTaskId);
+    }
+
    @Override
    public SurfaceControl getAnimationLeashParent() {
        if (WindowManagerService.sHierarchicalAnimations) {