commit db37d5899b00f34cc47014ee705d8038e6e20d5b
author Rob Carr <racarr@google.com> Tue Mar 10 12:31:07 2020 -0700
committer Rob Carr <racarr@google.com> Tue Mar 10 12:32:10 2020 -0700
tree c07f82e7b0f30e643f3fe0ad6c7a43e119efa412
parent d2d3e4d92dad44ffb736b60e274492ca5daec18d

WindowContainer: Obtain BLASTSyncTransaction from factory

So we don't mess up the tests using real objects.

Bug: 139371701
Test: Existing tests pass
Change-Id: Ib4be9997e8095d439b20624cf374f43e3d7aab47

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

diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index e8897e1..ec90097 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -275,7 +275,7 @@
     RemoteToken mRemoteToken = null;
 
     BLASTSyncEngine mBLASTSyncEngine = new BLASTSyncEngine();
-    SurfaceControl.Transaction mBLASTSyncTransaction = new SurfaceControl.Transaction();
+    SurfaceControl.Transaction mBLASTSyncTransaction;
     boolean mUsingBLASTSyncTransaction = false;
     BLASTSyncEngine.TransactionReadyListener mWaitingListener;
     int mWaitingSyncId;
@@ -283,6 +283,7 @@
     WindowContainer(WindowManagerService wms) {
         mWmService = wms;
         mPendingTransaction = wms.mTransactionFactory.get();
+        mBLASTSyncTransaction = wms.mTransactionFactory.get();
         mSurfaceAnimator = new SurfaceAnimator(this, this::onAnimationFinished, wms);
         mSurfaceFreezer = new SurfaceFreezer(this, wms);
     }