Merge "libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case"

am: 857b65657d

* commit '857b65657d453801e9b73f998043603456dac813':
  libhwui: handle eglSwapBuffers with EGL_BAD_NATIVE_WINDOW error case
This commit is contained in:
John Reck
2016-02-05 23:52:12 +00:00
committed by android-build-merger

View File

@@ -291,11 +291,11 @@ bool EglManager::swapBuffers(EGLSurface surface, const SkRect& dirty,
if (CC_LIKELY(err == EGL_SUCCESS)) {
return true;
}
if (err == EGL_BAD_SURFACE) {
if (err == EGL_BAD_SURFACE || err == EGL_BAD_NATIVE_WINDOW) {
// 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...", surface);
ALOGW("swapBuffers encountered EGL error %d on %p, halting rendering...", err, surface);
return false;
}
LOG_ALWAYS_FATAL("Encountered EGL error %d %s during rendering",