Merge "BLASTBufferQueue: Avoid unnecessary transactions" into rvc-dev am: 0bed41a993

Change-Id: I90ea9f38afae4b517705bb78adb3f08d8c76d889

core/java/android/view/ViewRootImpl.java

@@ -1747,16 +1747,13 @@ public final class ViewRootImpl implements ViewParent,
                 || !mBlastSurfaceControl.isValid()) {
             return null;
         }
+
         if (mBlastBufferQueue == null) {
             mBlastBufferQueue = new BLASTBufferQueue(
                 mBlastSurfaceControl, width, height);
         }
         mBlastBufferQueue.update(mBlastSurfaceControl, width, height);
 
-        mTransaction.show(mBlastSurfaceControl)
-            .reparent(mBlastSurfaceControl, mSurfaceControl)
-            .apply();
-
         return mBlastBufferQueue.getSurface();
     }
 

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

@@ -127,6 +127,7 @@ class WindowSurfaceController {
             mBLASTSurfaceControl = win.makeSurface()
                 .setParent(mSurfaceControl)
                 .setName("BLAST Adapter Layer")
+                .setHidden(false)
                 .setBLASTLayer()
                 .build();
         }