commit 841057ffc0283f7e5d5fd750ee1519ee313ed869
author John Reck <jreck@google.com> Wed May 07 21:24:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 07 21:24:23 2014 +0000
tree 5b27c527bb58d1f58dcd34b8a9cc9a899d103e5b
parent 603d270a531e6855418bffebdcdfbda013a2dbbe
parent 368cdd85268999997fb495cf90c4417221797de0

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

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index fc3548c..97baba8 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -349,6 +349,8 @@
         mDirtyRegionsEnabled = mGlobalContext->enableDirtyRegions(mEglSurface);
         mHaveNewSurface = true;
         makeCurrent();
+    } else {
+        mRenderThread.removeFrameCallback(this);
     }
 }
 
@@ -468,6 +470,10 @@
 
 // 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;