diff options
| author | Mathias Agopian <mathias@google.com> | 2011-01-25 14:43:05 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-25 14:43:05 -0800 |
| commit | 043a3cddf67e2baf38711bcb125084599f8f9802 (patch) | |
| tree | 6366c21a3691e937b3f95ac085e40a55e1cfcbef | |
| parent | d3fcd0a1c923498921107bb44fbc8b24582a170a (diff) | |
| parent | 84c6f5a44c431a36a9e4395a7e23ab26480ba689 (diff) | |
| download | frameworks_base-043a3cddf67e2baf38711bcb125084599f8f9802.zip frameworks_base-043a3cddf67e2baf38711bcb125084599f8f9802.tar.gz frameworks_base-043a3cddf67e2baf38711bcb125084599f8f9802.tar.bz2 | |
Merge "workaround [3201922] display not on: log full of gralloc errors (DO NOT MERGE)" into gingerbread
| -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; } |