Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d6145d authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Add task-id to animation leash" into rvc-dev am: 77542c73 am: 6d4ccd62 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11712798

Change-Id: Iaad24c6b6a301b250775037ce0e495c33cc1c5dc
parents 7bac8096 6d4ccd62

services/core/java/com/android/server/wm/Task.java

+5 −0
Original line number Diff line number Diff line
@@ -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) {