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

Commit 4d3dfb14 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Use animHandler for CUJ_DESKTOP_MODE_CLOSE_TASK 

The close-animation runs on the animation thread, so we should pass the
animation handler to InteractionJankMonitor.

Bug: 357811393
Test: manual (perfetto)
Flag: NONE jank/logging change

Change-Id: I3882338ce5fa9f94a3c9b40a3dbcff5b82507c88
parent 5c6fd9b6

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+3 −2
Original line number Diff line number Diff line
@@ -1075,8 +1075,9 @@ public abstract class WMShellModule { 
            Context context,

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellAnimationThread ShellExecutor animExecutor,

            @ShellMainThread Handler handler) {

        return new CloseDesktopTaskTransitionHandler(context, mainExecutor, animExecutor, handler);

            @ShellAnimationThread Handler animHandler) {

        return new CloseDesktopTaskTransitionHandler(context, mainExecutor, animExecutor,

                animHandler);

    }



    @WMSingleton

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/CloseDesktopTaskTransitionHandler.kt

+2 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import com.android.app.animation.Interpolators 
import com.android.internal.jank.Cuj.CUJ_DESKTOP_MODE_CLOSE_TASK

import com.android.internal.jank.InteractionJankMonitor

import com.android.wm.shell.common.ShellExecutor

import com.android.wm.shell.shared.annotations.ShellMainThread

import com.android.wm.shell.transition.Transitions

import java.util.function.Supplier
@@ -49,7 +48,7 @@ constructor( 
    private val mainExecutor: ShellExecutor,

    private val animExecutor: ShellExecutor,

    private val transactionSupplier: Supplier<Transaction> = Supplier { Transaction() },

    @ShellMainThread private val handler: Handler,

    private val animHandler: Handler,

) : Transitions.TransitionHandler {



    private val runningAnimations = mutableMapOf<IBinder, List<Animator>>()
@@ -95,7 +94,7 @@ constructor( 
            interactionJankMonitor.begin(

                lastChangeLeash,

                context,

                handler,

                animHandler,

                CUJ_DESKTOP_MODE_CLOSE_TASK,

            )

        }