commit c5cf471758169f7ffdf7669568a7780902159790
author John Reck <jreck@google.com> Mon Dec 01 21:47:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 01 21:47:03 2014 +0000
tree f8ff84ce373fde3e5163c466bf5f6f28a2ce2037
parent 6e8fea14ccc4c30d56a7f70c9addf3d5b8a229d2
parent d7af6eaace4ffdd3635a1cdeff65e9dc1af39f67

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

* commit 'd7af6eaace4ffdd3635a1cdeff65e9dc1af39f67':
  Prevent calling GL functions with an invalid surface

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index ee629c0..940580c 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) {