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

Commit c593d454 authored by Rob Carr's avatar Rob Carr Committed by android-build-merger
Browse files

Merge "ViewRoot: Check Surface validity before initializing renderer from... 

Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev am: cef96f69
am: c595c5c0

Change-Id: I7d364bdb71b47d1400a5db1775966fe6a6daa02b
parents 6f3f0a31 c595c5c0

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -3269,7 +3269,8 @@ public final class ViewRootImpl implements ViewParent, 
                // eglTerminate() for instance.

                if (mAttachInfo.mThreadedRenderer != null &&

                        !mAttachInfo.mThreadedRenderer.isEnabled() &&

                        mAttachInfo.mThreadedRenderer.isRequested()) {

                        mAttachInfo.mThreadedRenderer.isRequested() &&

                        mSurface.isValid()) {



                    try {

                        mAttachInfo.mThreadedRenderer.initializeIfNeeded(