Merge "Provide vsync id for all animation transactions (except PIP)"

core/java/android/view/InsetsAnimationThreadControlRunner.java

@@ -81,6 +81,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro
                 SyncRtSurfaceTransactionApplier.SurfaceParams surfaceParams = params[i];
                 applyParams(t, surfaceParams, mTmpFloat9);
             }
+            t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());
             t.apply();
             t.close();
         }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/DividerImeController.java

@@ -26,6 +26,7 @@ import android.annotation.Nullable;
 import android.graphics.Rect;
 import android.os.Handler;
 import android.util.Slog;
+import android.view.Choreographer;
 import android.view.SurfaceControl;
 import android.window.TaskOrganizer;
 import android.window.WindowContainerToken;
@@ -338,6 +339,7 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor
             SurfaceControl.Transaction t = mTransactionPool.acquire();
             float value = (float) animation.getAnimatedValue();
             onProgress(value, t);
+            t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());
             t.apply();
             mTransactionPool.release(t);
         });

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/DividerView.java

@@ -37,6 +37,7 @@ import android.os.Handler;
 import android.os.RemoteException;
 import android.util.AttributeSet;
 import android.util.Slog;
+import android.view.Choreographer;
 import android.view.Display;
 import android.view.MotionEvent;
 import android.view.PointerIcon;
@@ -1108,6 +1109,7 @@ public class DividerView extends FrameLayout implements OnTouchListener,
             }
             resizeSplitSurfaces(t, mDockedRect, mDockedTaskRect, mOtherRect, mOtherTaskRect);
             if (ownTransaction) {
+                t.setFrameTimelineVsync(Choreographer.getSfInstance().getVsyncId());
                 t.apply();
                 mTiles.releaseTransaction(t);
             }

services/core/java/com/android/server/wm/SurfaceAnimationRunner.java

@@ -259,6 +259,7 @@ class SurfaceAnimationRunner {
 
     private void applyTransaction() {
         mFrameTransaction.setAnimationTransaction();
+        mFrameTransaction.setFrameTimelineVsync(mChoreographer.getVsyncId());
         mFrameTransaction.apply();
         mApplyScheduled = false;
     }