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

Commit 841057ff authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Don't try to draw if there's no canvas or surface"

parents 603d270a 368cdd85

libs/hwui/renderthread/CanvasContext.cpp

+6 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ void CanvasContext::setSurface(EGLNativeWindowType window) { 
        mDirtyRegionsEnabled = mGlobalContext->enableDirtyRegions(mEglSurface);

        mHaveNewSurface = true;

        makeCurrent();

    } else {

        mRenderThread.removeFrameCallback(this);

    }

}
@@ -468,6 +470,10 @@ void CanvasContext::draw(Rect* dirty) { 


// Called by choreographer to do an RT-driven animation

void CanvasContext::doFrame() {

    if (CC_UNLIKELY(!mCanvas || mEglSurface == EGL_NO_SURFACE)) {

        return;

    }



    ATRACE_CALL();



    TreeInfo info;