commit 4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f
author John Reck <jreck@google.com> Tue Nov 25 19:59:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 25 19:59:05 2014 +0000
tree 6c827452988e9f4dd98e4bc5d93812cda1760bf9
parent dccd3662da356ed7b0beedc09c8a58103723b463
parent dec3f138c2f6a31879b0fe055a26d618e4874bb5

am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev

* commit 'dec3f138c2f6a31879b0fe055a26d618e4874bb5':
  Force-use the pbuffer surface for destroy

libs/hwui/renderthread/CanvasContext.cpp

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