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

Commit 17262154 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

[PiP2] Start with non-null pip params 

Apps and certain tests actually send empty
PiP params with direct enterPictureInPictureMode()
API calls, which ends up being converted to null when
doing the fillTaskInfo() for TransitionInfo.Changes in Core.

So we need to avoid NPEs in Shell when resolving these transitions.
We do this by starting out with an empty pip params if a null one is
provided through a Transitions PiP target.

Bug: 379390590
Flag: com.android.wm.shell.enable_pip2
Test: atest PinnedStackTests#testNonTappablePipActivity
Change-Id: I165d565f6a7e33ec3c0f5aa53d6fd1cebc2cdac7
parent 025f8b58

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

+3 −1
Original line number Diff line number Diff line
@@ -400,7 +400,9 @@ public class PipTransition extends PipTransitionController implements 
        final SurfaceControl pipLeash = getLeash(pipChange);

        final Rect startBounds = pipChange.getStartAbsBounds();

        final Rect endBounds = pipChange.getEndAbsBounds();

        final PictureInPictureParams params = pipChange.getTaskInfo().pictureInPictureParams;

        final PictureInPictureParams params = pipChange.getTaskInfo().pictureInPictureParams != null

                ? pipChange.getTaskInfo().pictureInPictureParams

                : new PictureInPictureParams.Builder().build();

        final Rect adjustedSourceRectHint = getAdjustedSourceRectHint(info, pipChange,

                pipActivityChange);