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

Commit 8f7c2ac2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Log dispatch when handler chosen before playTransition is called" into... 

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

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



Change-Id: I910fd625c499be4c0ace91b3654a452ba2b6423f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ce480a68 b7d3ddb8

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

+2 −4
Original line number Diff line number Diff line
@@ -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<Transitions>, 
                    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<Transitions>, 
            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);

            }

        }