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

Commit e80f306f authored by Valerie Hau's avatar Valerie Hau Committed by Android (Google) Code Review
Browse files

Merge "Fixing another crash when creating/updating BLASTBufferQueue"

parents 7f78246d a8fe8429

core/java/android/view/ViewRootImpl.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -1705,12 +1705,13 @@ public final class ViewRootImpl implements ViewParent, 
    }

    }





    Surface getOrCreateBLASTSurface(int width, int height) {

    Surface getOrCreateBLASTSurface(int width, int height) {

        if (mSurfaceControl == null || !mSurfaceControl.isValid()) {

        if (mSurfaceControl == null

                || !mSurfaceControl.isValid()

                || mBlastSurfaceControl == null

                || !mBlastSurfaceControl.isValid()) {

            return null;

            return null;

        }

        }

        if ((mBlastSurfaceControl != null)

        if (mBlastBufferQueue == null) {

                && (mBlastBufferQueue == null)

                && mBlastSurfaceControl.isValid()) {

            mBlastBufferQueue = new BLASTBufferQueue(

            mBlastBufferQueue = new BLASTBufferQueue(

                mBlastSurfaceControl, width, height);

                mBlastSurfaceControl, width, height);

        }

        }