commit e39f788950c60f6468a038f88e6dc7ac5ee65f8f
author John Reck <jreck@google.com> Wed Nov 26 12:09:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 26 12:09:42 2014 +0000
tree 89d0720d85d43aaf47ad2daf77817d9980af1cdf
parent 2edf7d6065d7ac3bff500b93daab4860a3f3741d
parent 0d4ab958c11801f5453e999f930416c87c63d100

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

* commit '0d4ab958c11801f5453e999f930416c87c63d100':
  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 ee629c0..25b13c1 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) {