From 0ba0ad9236ad6c2100b8771da1b164fb9b9c12cf Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Wed, 3 May 2023 15:55:44 +0000 Subject: [PATCH] Log dispatch when handler chosen before playTransition is called Test: capture trace in winscope and make sure we always have dispatch times Bug: 277181336 Change-Id: I63b30960ac4a3e7d4887bb7b29b6b3d4fda374e1 --- .../src/com/android/wm/shell/transition/Transitions.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index a73ab776486b3..fda943d7dc025 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -19,8 +19,6 @@ package com.android.wm.shell.transition; import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManager.TRANSIT_FIRST_CUSTOM; -import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY; -import static android.view.WindowManager.TRANSIT_KEYGUARD_UNOCCLUDE; import static android.view.WindowManager.TRANSIT_OPEN; import static android.view.WindowManager.TRANSIT_SLEEP; import static android.view.WindowManager.TRANSIT_TO_BACK; @@ -851,14 +849,13 @@ public class Transitions implements RemoteCallable, active.mStartT, active.mFinishT, (wct, cb) -> onFinish(active, wct, cb)); if (consumed) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by firstHandler"); + mTracer.logDispatched(active.mInfo.getDebugId(), active.mHandler); return; } } // Otherwise give every other handler a chance active.mHandler = dispatchTransition(active.mToken, active.mInfo, active.mStartT, active.mFinishT, (wct, cb) -> onFinish(active, wct, cb), active.mHandler); - - mTracer.logDispatched(active.mInfo.getDebugId(), active.mHandler); } /** @@ -877,6 +874,7 @@ public class Transitions implements RemoteCallable, if (consumed) { ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by %s", mHandlers.get(i)); + mTracer.logDispatched(info.getDebugId(), mHandlers.get(i)); return mHandlers.get(i); } }