diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-25 14:46:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-25 14:46:27 -0800 |
| commit | 63e4bba51501f9a6f27beccaae7f8e0b78ac767c (patch) | |
| tree | bdf96fc7242cd1b93ba9e5e079182d61e2b3ff60 /services/surfaceflinger | |
| parent | 59f71e7feb9034c61cf531031063396d0fb97176 (diff) | |
| parent | 78bd4f68a9e8928b626e0e4dd2f91484de544fa1 (diff) | |
| download | frameworks_native-63e4bba51501f9a6f27beccaae7f8e0b78ac767c.zip frameworks_native-63e4bba51501f9a6f27beccaae7f8e0b78ac767c.tar.gz frameworks_native-63e4bba51501f9a6f27beccaae7f8e0b78ac767c.tar.bz2 | |
am 043a3cdd: Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
* commit '043a3cddf67e2baf38711bcb125084599f8f9802':
workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)
Diffstat (limited to 'services/surfaceflinger')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index af0f95a..664e5ad 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -406,6 +406,7 @@ bool SurfaceFlinger::threadLoop() logger.log(GraphicLog::SF_REPAINT_DONE, index); } else { // pretend we did the post + hw.compositionComplete(); unlockClients(); usleep(16667); // 60 fps period } @@ -2172,6 +2173,9 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy, glBindFramebufferOES(GL_FRAMEBUFFER_OES, 0); glDeleteRenderbuffersOES(1, &tname); glDeleteFramebuffersOES(1, &name); + + hw.compositionComplete(); + return result; } |