am b06fbffb: am 32341381: only abort when errors happen on the main display

* commit 'b06fbffbded32050e91e1c65b452856a1a264d22':
  only abort when errors happen on the main display
This commit is contained in:
Mathias Agopian 2012-09-25 19:24:03 -07:00 committed by Android Git Automerger
commit 29911c8b1a

View File

@ -228,11 +228,14 @@ void DisplayDevice::swapBuffers(HWComposer& hwc) const {
} }
} }
// TODO: we should at least handle EGL_CONTEXT_LOST, by recreating the if (!success) {
// context and resetting our state. EGLint error = eglGetError();
LOG_ALWAYS_FATAL_IF(!success, if (error == EGL_CONTEXT_LOST ||
"eglSwapBuffers(%p, %p) failed with 0x%8x", mType == DisplayDevice::DISPLAY_PRIMARY) {
mDisplay, mSurface, eglGetError()); LOG_ALWAYS_FATAL("eglSwapBuffers(%p, %p) failed with 0x%08x",
mDisplay, mSurface, eglGetError());
}
}
} }
void DisplayDevice::onSwapBuffersCompleted(HWComposer& hwc) const { void DisplayDevice::onSwapBuffersCompleted(HWComposer& hwc) const {