commit 2cdbc7d2283aae3d77b12c8fdbba8ca4bd3db5ea
author John Reck <jreck@google.com> Wed Sep 17 16:06:36 2014 -0700
committer John Reck <jreck@google.com> Wed Sep 17 16:09:57 2014 -0700
tree a129c07e75038b92257f5c6d16eb5dc13c79f8d6
parent 9077cbc30e6c71c8d103ae44b0c30b765e42f66b

Special case EGL_BAD_SURFACE

 Bug: 17516789

Change-Id: I3dcb10360c2aef6326f7dbbff6815866d4c143b6

libs/hwui/renderthread/CanvasContext.cpp

diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp
index 5e6796c..832d170 100644
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -91,7 +91,9 @@
 }
 
 void CanvasContext::swapBuffers() {
-    mEglManager.swapBuffers(mEglSurface);
+    if (CC_UNLIKELY(!mEglManager.swapBuffers(mEglSurface))) {
+        setSurface(NULL);
+    }
     mHaveNewSurface = false;
 }
 
@@ -102,8 +104,8 @@
 }
 
 bool CanvasContext::initialize(ANativeWindow* window) {
-    if (mCanvas) return false;
     setSurface(window);
+    if (mCanvas) return false;
     mCanvas = new OpenGLRenderer(mRenderThread.renderState());
     mCanvas->initProperties();
     return true;