Merge "Prevent calling GL functions with an invalid surface"

2014-12-01 21:28:26 +00:00
parent ee7c30e1f9 f76d36f96b
commit 6afc5cf3d9
1 changed files with 1 additions and 1 deletions
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -59,6 +59,7 @@ CanvasContext::~CanvasContext() {

 void CanvasContext::destroy() {
    stopDrawing();
+    setSurface(NULL);
    freePrefetechedLayers();
    destroyHardwareResources();
    mAnimationContext->destroy();
@@ -66,7 +67,6 @@ void CanvasContext::destroy() {
        delete mCanvas;
        mCanvas = 0;
    }
-    setSurface(NULL);
 }

 void CanvasContext::setSurface(ANativeWindow* window) {