Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log dispatch when handler chosen before playTransition is called" into udc-dev am: b7d3ddb89f

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

Change-Id: I5311a7a15fed242be23aa1e2c78d971e7beba768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-05-04 19:19:04 +00:00
committed by Automerger Merge Worker
parent a4e3c52d7c b7d3ddb89f
commit 5dab4d740a
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
View File

@@ -19,8 +19,6 @@ package com.android.wm.shell.transition;
import static android.view.WindowManager.TRANSIT_CHANGE; import static android.view.WindowManager.TRANSIT_CHANGE;
import static android.view.WindowManager.TRANSIT_CLOSE; import static android.view.WindowManager.TRANSIT_CLOSE;
import static android.view.WindowManager.TRANSIT_FIRST_CUSTOM; 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_OPEN;
import static android.view.WindowManager.TRANSIT_SLEEP; import static android.view.WindowManager.TRANSIT_SLEEP;
import static android.view.WindowManager.TRANSIT_TO_BACK; import static android.view.WindowManager.TRANSIT_TO_BACK;
@@ -851,14 +849,13 @@ public class Transitions implements RemoteCallable<Transitions>,
active.mStartT, active.mFinishT, (wct, cb) -> onFinish(active, wct, cb)); active.mStartT, active.mFinishT, (wct, cb) -> onFinish(active, wct, cb));
if (consumed) { if (consumed) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by firstHandler"); ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by firstHandler");
mTracer.logDispatched(active.mInfo.getDebugId(), active.mHandler);
return; return;
} }
} }
// Otherwise give every other handler a chance // Otherwise give every other handler a chance
active.mHandler = dispatchTransition(active.mToken, active.mInfo, active.mStartT, active.mHandler = dispatchTransition(active.mToken, active.mInfo, active.mStartT,
active.mFinishT, (wct, cb) -> onFinish(active, wct, cb), active.mHandler); 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<Transitions>,
if (consumed) { if (consumed) {
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by %s", ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, " animated by %s",
mHandlers.get(i)); mHandlers.get(i));
mTracer.logDispatched(info.getDebugId(), mHandlers.get(i));
return mHandlers.get(i); return mHandlers.get(i);
} }
} }