Merge "Check that the PiPParams are not null before getting seamless flag" into sc-dev

This commit is contained in:
Jorge Gil
2021-03-31 00:22:54 +00:00
committed by Android (Google) Code Review

View File

@@ -951,6 +951,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