commit d1ddcf19bbb17cad09ec93b2ad09b1e1e0bfb3ff
author John Reck <jreck@google.com> Fri Feb 05 15:59:55 2016 -0800
committer John Reck <jreck@google.com> Fri Feb 05 15:59:55 2016 -0800
tree 0040c8db3c139a79e60e929c2831fab2f0bdacbe
parent af78708e98e931dcb987a54268c24d3475668e05
parent 9ea5295597aa82b261863097d3d2f989ada733d5

resolve merge conflicts of 9ea5295597 to master.

Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50

libs/hwui/renderthread/EglManager.cpp

diff --git a/libs/hwui/renderthread/EglManager.cpp b/libs/hwui/renderthread/EglManager.cpp
index 805bec1..364d4dd 100644
--- a/libs/hwui/renderthread/EglManager.cpp
+++ b/libs/hwui/renderthread/EglManager.cpp
@@ -344,8 +344,8 @@
         // For some reason our surface was destroyed out from under us
         // This really shouldn't happen, but if it does we can recover easily
         // by just not trying to use the surface anymore
-        ALOGW("swapBuffers encountered EGL_BAD_SURFACE on %p, halting rendering...",
-                frame.mSurface);
+        ALOGW("swapBuffers encountered EGL error %d on %p, halting rendering...",
+                err, frame.mSurface);
         return false;
     }
     LOG_ALWAYS_FATAL("Encountered EGL error %d %s during rendering",