Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 9ea5295597 to master.

Browse Source 
Change-Id: I68b883e8a1bb17abd4cf151d057dd07e53a80f50
This commit is contained in:
John Reck
2016-02-05 15:59:55 -08:00
parent af78708e98 9ea5295597
commit d1ddcf19bb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/renderthread/EglManager.cpp
View File

@@ -344,8 +344,8 @@ bool EglManager::swapBuffers(const Frame& frame, const SkRect& screenDirty) {
// 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",