Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58c44d49 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

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

Change-Id: I322fc515afff66e22886c1cb56eb64e094bc2c6d
parents 005e8990 0bed41a9

core/java/android/view/ViewRootImpl.java

+1 −4
Original line number Original line Diff line number Diff line
@@ -1747,16 +1747,13 @@ public final class ViewRootImpl implements ViewParent, 
                || !mBlastSurfaceControl.isValid()) {

                || !mBlastSurfaceControl.isValid()) {

            return null;

            return null;

        }

        }



        if (mBlastBufferQueue == null) {

        if (mBlastBufferQueue == null) {

            mBlastBufferQueue = new BLASTBufferQueue(

            mBlastBufferQueue = new BLASTBufferQueue(

                mBlastSurfaceControl, width, height);

                mBlastSurfaceControl, width, height);

        }

        }

        mBlastBufferQueue.update(mBlastSurfaceControl, width, height);

        mBlastBufferQueue.update(mBlastSurfaceControl, width, height);





        mTransaction.show(mBlastSurfaceControl)

            .reparent(mBlastSurfaceControl, mSurfaceControl)

            .apply();



        return mBlastBufferQueue.getSurface();

        return mBlastBufferQueue.getSurface();

    }

    }

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -127,6 +127,7 @@ class WindowSurfaceController { 
            mBLASTSurfaceControl = win.makeSurface()

            mBLASTSurfaceControl = win.makeSurface()

                .setParent(mSurfaceControl)

                .setParent(mSurfaceControl)

                .setName("BLAST Adapter Layer")

                .setName("BLAST Adapter Layer")

                .setHidden(false)

                .setBLASTLayer()

                .setBLASTLayer()

                .build();

                .build();

        }

        }