Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread

This commit is contained in:
Mathias Agopian 2011-01-25 14:43:05 -08:00 committed by Android (Google) Code Review
commit 78bd4f68a9

View File

@ -406,6 +406,7 @@ bool SurfaceFlinger::threadLoop()
logger.log(GraphicLog::SF_REPAINT_DONE, index); logger.log(GraphicLog::SF_REPAINT_DONE, index);
} else { } else {
// pretend we did the post // pretend we did the post
hw.compositionComplete();
unlockClients(); unlockClients();
usleep(16667); // 60 fps period usleep(16667); // 60 fps period
} }
@ -2172,6 +2173,9 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0); glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0);
glDeleteRenderbuffersOES(1, &tname); glDeleteRenderbuffersOES(1, &tname);
glDeleteFramebuffersOES(1, &name); glDeleteFramebuffersOES(1, &name);
hw.compositionComplete();
return result; return result;
} }