am e986817a: am 6eac26a4: am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev

* commit 'e986817a2dc8a412c12e456319965a67ac60f236':
  Revert "Force-use the pbuffer surface for destroy"

libs/hwui/renderthread/CanvasContext.cpp

@@ -60,8 +60,6 @@ CanvasContext::~CanvasContext() {
 
 void CanvasContext::destroy() {
     stopDrawing();
-    setSurface(NULL);
-    mEglManager.usePBufferSurface();
     freePrefetechedLayers();
     destroyHardwareResources();
     mAnimationContext->destroy();
@@ -69,6 +67,7 @@ void CanvasContext::destroy() {
         delete mCanvas;
         mCanvas = 0;
     }
+    setSurface(NULL);
 }
 
 void CanvasContext::setSurface(ANativeWindow* window) {