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

Commit f0a24dd2 authored by Valerie Hau's avatar Valerie Hau
Browse files

Fix segfault in ViewRootImpl on BLAST 

Recent deferTransaction change created
bootloop when BLAST is turned on
Bug: 146345307
Test: build, boot, manual

Change-Id: Ib5e484c39d11260026694fc2a32015d8a7f04baf
parent bc0a0675

core/java/android/view/ViewRootImpl.java

+4 −2
Original line number Diff line number Diff line
@@ -1699,7 +1699,9 @@ public final class ViewRootImpl implements ViewParent, 
        if (mSurfaceControl == null || !mSurfaceControl.isValid()) {

            return null;

        }

        if ((mBlastBufferQueue != null) && mBlastSurfaceControl.isValid()) {

        if ((mBlastSurfaceControl != null)

                && (mBlastBufferQueue == null)

                && mBlastSurfaceControl.isValid()) {

            mBlastBufferQueue = new BLASTBufferQueue(

                mBlastSurfaceControl, width, height);

        }