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

Commit 7b888dcc authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Add null check to onTransitionMerged" into udc-dev

parents 93b092bd bf04b9d9

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

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




    @Override

    @Override

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

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

        if (mTransitionPausingRelayout.equals(merged)) {

        if (merged.equals(mTransitionPausingRelayout)) {

            mTransitionPausingRelayout = playing;

            mTransitionPausingRelayout = playing;

        }

        }

    }

    }