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

Commit 3de96155 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Early bail out if the leash is invalid." into udc-dev am: 583829fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22435992



Change-Id: I5fd42e70dcb12f464619636c96d0cde625547daa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28bc023d 583829fc

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

+5 −0
Original line number Diff line number Diff line
@@ -1582,6 +1582,11 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            @PipAnimationController.TransitionDirection int direction,

            SurfaceControl.Transaction tx,

            WindowContainerTransaction wct) {

        if (mLeash == null || !mLeash.isValid()) {

            ProtoLog.w(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: Invalid leash on prepareFinishResizeTransaction: %s", TAG, mLeash);

            return;

        }

        final Rect taskBounds;

        if (isInPipDirection(direction)) {

            // If we are animating from fullscreen using a bounds animation, then reset the