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

Commit 602d232a authored by jorgegil@google.com's avatar jorgegil@google.com Committed by Jorge Gil
Browse files

Check that the PiPParams are not null before getting seamless flag 

Fixes NPE when the PIP params are not specified by the app

Bug: 183140098
Test: Enter PIP and resize without PIP params
Change-Id: I1c38586fbcea0a3141ef6cdfc3881f62dbc9148f
parent 06af0988

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

+1 −0
Original line number Diff line number Diff line
@@ -946,6 +946,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                || direction == TRANSITION_DIRECTION_EXPAND_OR_UNEXPAND;

        // Animate with a cross-fade if enabled and seamless resize is disables by the app.

        final boolean animateCrossFadeResize = mayAnimateFinishResize

                && mPictureInPictureParams != null

                && !mPictureInPictureParams.isSeamlessResizeEnabled();

        if (animateCrossFadeResize) {

            // Take a snapshot of the PIP task and hide it. We'll show it and fade it out after