am d51205fd: am 6afc5cf3: Merge "Prevent calling GL functions with an invalid surface"

* commit 'd51205fda7351ca32e54ef34b32e72f6c7c79847': Prevent calling GL functions with an invalid surface
2014-12-01 21:40:32 +00:00
parent b62b1b0379 d51205fda7
commit d7af6eaace
1 changed files with 1 additions and 1 deletions
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -60,6 +60,7 @@ CanvasContext::~CanvasContext() {

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

 void CanvasContext::setSurface(ANativeWindow* window) {