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

Commit 008772e7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add debug info around external transitions" into main

parents 86423e0e 5dbc7818

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleController.java

+3 −0
Original line number Diff line number Diff line
@@ -449,6 +449,8 @@ public class BubbleController implements ConfigurationChangeListener, 
                        mSkipAddingBackBubbleOnMoveToFullScreen = true;

                    } else {

                        mBarToFloatingTransition = new Binder();

                        ProtoLog.d(WM_SHELL_BUBBLES, "enqueuing bar to floating transition %s",

                                mBarToFloatingTransition);

                        mBubbleTransitions.mTaskViewTransitions.enqueueExternal(

                                bubble.getTaskView().getController(),

                                () -> mBarToFloatingTransition);
@@ -2995,6 +2997,7 @@ public class BubbleController implements ConfigurationChangeListener, 
        pw.print(prefix); pw.println("  bubbleStateListenerSet= " + (mBubbleStateListener != null));

        pw.print(prefix); pw.println("  stackViewSet= " + (mStackView != null));

        pw.print(prefix); pw.println("  layerViewSet= " + (mLayerView != null));

        pw.print(prefix); pw.println("  mBarToFloatingTransition= " + mBarToFloatingTransition);

        pw.println();



        mBubbleData.dump(pw);

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java

+8 −5
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.view.WindowManager.TRANSIT_TO_FRONT; 
import static com.android.window.flags.Flags.enableHandlersDebuggingMode;

import static com.android.wm.shell.Flags.FLAG_ENABLE_CREATE_ANY_BUBBLE;

import static com.android.wm.shell.bubbles.util.BubbleUtils.getExitBubbleTransaction;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES;

import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_BUBBLES_NOISY;

import static com.android.wm.shell.transition.TransitionDispatchState.CAPTURED_CHANGE_IN_WRONG_TRANSITION;

import static com.android.wm.shell.transition.TransitionDispatchState.CAPTURED_UNRELATED_CHANGE;
@@ -208,8 +209,9 @@ public class TaskViewTransitions implements Transitions.TransitionHandler, TaskV 
     * In practice, the external is usually another transition on a different handler.

     */

    public void enqueueExternal(@NonNull TaskViewTaskController taskView, ExternalTransition ext) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY, "Transitions.enqueueExternal(): taskView=%d pending=%d",

                taskView.hashCode(), mPending.size());

        ProtoLog.d(WM_SHELL_BUBBLES,

                "TaskViewTransitions.enqueueExternal(): transition=%s taskView=%d pending=%d",

                ext, taskView.hashCode(), mPending.size());

        final PendingTransition pending = new PendingTransition(

                TRANSIT_NONE, null /* wct */, taskView, null /* cookie */);

        pending.mExternalTransition = ext;
@@ -226,9 +228,10 @@ public class TaskViewTransitions implements Transitions.TransitionHandler, TaskV 
     */

    public void enqueueRunningExternal(@NonNull TaskViewTaskController taskView,

            IBinder transition) {

        ProtoLog.d(WM_SHELL_BUBBLES_NOISY,

                "Transitions.enqueueRunningExternal(): taskView=%d pending=%d",

                taskView.hashCode(), mPending.size());

        ProtoLog.d(WM_SHELL_BUBBLES,

                "TaskViewTransitions.enqueueRunningExternal(): "

                    + "transition=%s taskView=%d pending=%d",

                transition, taskView.hashCode(), mPending.size());

        final PendingTransition pending = new PendingTransition(

                TRANSIT_NONE, null /* wct */, taskView, null /* cookie */);

        pending.mExternalTransition = () -> transition;