commit a3ba0f9f6df933ced484d38fbbef27af8a9c91c6
author Rob Carr <racarr@google.com> Tue Apr 13 19:47:25 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 13 19:47:25 2021 +0000
tree b6ac296484af79be8a9162c8094c5f483f9f1740
parent 1e849a95f9a920e4c079230b0b26deadf052be8a
parent cf2e907f56d9531adff2d9ffc057706b158c86b2

Merge "Launcher3: Port SurfaceTransactionApplier to BLAST" into sc-dev

quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java

diff --git a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
index 0436a1c..3b4fd31 100644
--- a/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
+++ b/quickstep/src/com/android/quickstep/util/SurfaceTransactionApplier.java
@@ -15,8 +15,6 @@
  */
 package com.android.quickstep.util;
 
-import static com.android.systemui.shared.system.TransactionCompat.deferTransactionUntil;
-
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.os.Handler;
@@ -90,11 +88,10 @@
             for (int i = params.length - 1; i >= 0; i--) {
                 SurfaceParams surfaceParams = params[i];
                 if (surfaceParams.surface.isValid()) {
-                    deferTransactionUntil(t, surfaceParams.surface, mBarrierSurfaceControl, frame);
-                    surfaceParams.applyTo(t);
+                      surfaceParams.applyTo(t);
                 }
             }
-            t.apply();
+            mTargetViewRootImpl.mergeWithNextTransaction(t, frame);
             Message.obtain(mApplyHandler, MSG_UPDATE_SEQUENCE_NUMBER, toApplySeqNo, 0)
                     .sendToTarget();
         });