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

Commit eadefacc authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Update callsites for leashes in a transition" into udc-dev am:... 

Merge "Merge "Update callsites for leashes in a transition" into udc-dev am: 3e130b12 am: f228728a"
parents 2db4a3e1 892dd99f

core/java/android/window/TransitionInfo.java

+10 −0
Original line number Diff line number Diff line
@@ -549,6 +549,16 @@ public final class TransitionInfo implements Parcelable { 
        }

    }



    /**

     * Updates the callsites of all the surfaces in this transition, which aids in the debugging of

     * lingering surfaces.

     */

    public void setUnreleasedWarningCallSiteForAllSurfaces(String callsite) {

        for (int i = mChanges.size() - 1; i >= 0; --i) {

            mChanges.get(i).getLeash().setUnreleasedWarningCallSite(callsite);

        }

    }



    /**

     * Makes a copy of this as if it were parcel'd and unparcel'd. This implies that surfacecontrol

     * refcounts are incremented which allows the "remote" receiver to release them without breaking

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

+1 −0
Original line number Diff line number Diff line
@@ -641,6 +641,7 @@ public class Transitions implements RemoteCallable<Transitions>, 
    @VisibleForTesting

    void onTransitionReady(@NonNull IBinder transitionToken, @NonNull TransitionInfo info,

            @NonNull SurfaceControl.Transaction t, @NonNull SurfaceControl.Transaction finishT) {

        info.setUnreleasedWarningCallSiteForAllSurfaces("Transitions.onTransitionReady");

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "onTransitionReady %s: %s",

                transitionToken, info);

        final int activeIdx = findByToken(mPendingTransitions, transitionToken);