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

Commit 324f4da1 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Prevent IndexOutOfBoundsException in PipTransition" into main

parents 01b079ef f8a26280

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+7 −2
Original line number Diff line number Diff line
@@ -818,8 +818,13 @@ public class PipTransition extends PipTransitionController { 
            @NonNull Transitions.TransitionFinishCallback finishCallback,

            @NonNull TaskInfo taskInfo) {

        startTransaction.apply();

        if (info.getChanges().isEmpty()) {

            ProtoLog.e(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "removePipImmediately is called with empty changes");

        } else {

            finishTransaction.setWindowCrop(info.getChanges().get(0).getLeash(),

                    mPipDisplayLayoutState.getDisplayBounds());

        }

        mPipOrganizer.onExitPipFinished(taskInfo);

        finishCallback.onTransitionFinished(null);

    }