diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.h | 1 | ||||
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.h b/libs/hwui/renderthread/CanvasContext.h index f2fa9cd..91ac64e 100644 --- a/libs/hwui/renderthread/CanvasContext.h +++ b/libs/hwui/renderthread/CanvasContext.h @@ -117,6 +117,7 @@ private: // TODO: Replace with something better for layer & other GL object // lifecycle tracking friend class android::uirenderer::RenderState; + friend class RenderProxy; void setSurface(ANativeWindow* window); void swapBuffers(const SkRect& dirty, EGLint width, EGLint height); diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index 6d9acd4..bad12bb 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -147,7 +147,9 @@ bool RenderProxy::initialize(const sp<ANativeWindow>& window) { SETUP_TASK(initialize); args->context = mContext; args->window = window.get(); - return (bool) postAndWait(task); + bool ret = mContext->mCanvas == NULL; + post(task); + return ret; } CREATE_BRIDGE2(updateSurface, CanvasContext* context, ANativeWindow* window) { |