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

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

Merge "Merge "Add null check to onTransitionMerged" into udc-dev am: 7b888dcc am: 134be832"

parents 9a5fcf0d 248cf409

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel { 


    @Override

    public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) {

        if (mTransitionPausingRelayout.equals(merged)) {

        if (merged.equals(mTransitionPausingRelayout)) {

            mTransitionPausingRelayout = playing;

        }

    }