Merge "[PiP2] Bail out early if activityInfo=null" into main

import androidx.annotation.Nullable;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.protolog.ProtoLog;

import com.android.launcher3.icons.IconProvider;

import com.android.wm.shell.R;

import com.android.wm.shell.common.pip.PipUtils;

import com.android.wm.shell.pip2.PipSurfaceTransactionHelper;

import com.android.wm.shell.pip2.phone.PipAppIconOverlay;

import com.android.wm.shell.protolog.ShellProtoLogGroup;

import com.android.wm.shell.shared.animation.Interpolators;

import com.android.wm.shell.shared.pip.PipContentOverlay;

 * Animator that handles bounds animations for entering PIP.

 */

public class PipEnterAnimator extends ValueAnimator {

    private static final String TAG = PipEnterAnimator.class.getSimpleName();

    @NonNull private final SurfaceControl mLeash;

    private final SurfaceControl.Transaction mStartTransaction;

    private final SurfaceControl.Transaction mFinishTransaction;

        }

        mContentOverlay = mPipAppIconOverlaySupplier.get(context, appBounds, destinationBounds,

                activityInfo, appIconSizePx);

        if (mContentOverlay != null) {

            mContentOverlay.attach(tx, mLeash);

        }

    }

    /**

     * Clears the {@link #mContentOverlay}, this should be done after the content overlay is

        mContentOverlay = null;

    }

    @Nullable

    private PipAppIconOverlay getAppIconOverlay(

            Context context, Rect appBounds, Rect destinationBounds,

            ActivityInfo activityInfo, int iconSize) {

        if (activityInfo == null) {

            ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: activityInfo=null when trying to add app icon overlay", TAG);

            return null;

        }

        return new PipAppIconOverlay(context, appBounds, destinationBounds,

                new IconProvider(context).getIcon(activityInfo), iconSize);

    }