Merge "WM: Fix jumpcut animations"

        // requires freezing various Surface states and won't work well

        // with animations, so we disable it in the animation case for now.

        if (w != null && !w.isAnimatingLw() &&

                ((w.getAttrs().rotationAnimation == ROTATION_ANIMATION_JUMPCUT) ||

                        (w.getAttrs().rotationAnimation == ROTATION_ANIMATION_SEAMLESS))) {

                w.getAttrs().rotationAnimation == ROTATION_ANIMATION_SEAMLESS) {

            return true;

        }

        return false;

package com.android.server.wm;

import static android.graphics.PixelFormat.OPAQUE;

import static android.view.SurfaceControl.FX_SURFACE_DIM;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_SURFACE_ALLOC;

import static com.android.server.wm.WindowManagerDebugConfig.SHOW_TRANSACTIONS;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

import java.io.PrintWriter;

import android.graphics.Matrix;

import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.util.Slog;

import android.view.Surface.OutOfResourcesException;

import android.view.SurfaceControl;

import java.io.PrintWriter;

/**

 * Four black surfaces put together to make a black frame.

 */

            transaction.setLayerStack(surface, dc.getDisplayId());

            transaction.setAlpha(surface, 1);

            transaction.setLayer(surface, layer);

            transaction.setPosition(surface, left, top);

            transaction.show(surface);

            if (SHOW_TRANSACTIONS || SHOW_SURFACE_ALLOC) Slog.i(TAG_WM,

                            "  BLACK " + surface + ": CREATE layer=" + layer);