commit 76de89820c51c4bc288b440a82374b9d6c806244
author John Reck <jreck@google.com> Mon Dec 01 22:39:29 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 22:39:31 2014 +0000
tree bac5be532ce1ef3c84c973752529a5cccfbb374a
parent e6bd61d5bbea012b6b80c8bff915042f615630bc
parent a12b2405df5c12363e24cebc684f5f3a5c9a5b7b

Merge "Prevent calling GL functions with an invalid surface" into lmp-mr1-dev

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 39528be..aa32541 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -60,6 +60,7 @@
 
 void CanvasContext::destroy() {
     stopDrawing();
+    setSurface(NULL);
     freePrefetechedLayers();
     destroyHardwareResources();
     mAnimationContext->destroy();
@@ -67,7 +68,6 @@
         delete mCanvas;
         mCanvas = 0;
     }
-    setSurface(NULL);
 }
 
 void CanvasContext::setSurface(ANativeWindow* window) {