diff options
| author | Jesse Hall <jessehall@google.com> | 2014-10-22 20:45:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 20:45:35 +0000 |
| commit | 8ad8c0a775a1d4592479731973238b82480f76b2 (patch) | |
| tree | 40358a516720b5995c78a61baa319362c18a64ab /services/surfaceflinger | |
| parent | dcc959beb77099d319a94e3985da2f4ea4064e7b (diff) | |
| parent | afe2b1fadd29149ceed639357e44e06e97c3a5ca (diff) | |
| download | frameworks_native-8ad8c0a775a1d4592479731973238b82480f76b2.zip frameworks_native-8ad8c0a775a1d4592479731973238b82480f76b2.tar.gz frameworks_native-8ad8c0a775a1d4592479731973238b82480f76b2.tar.bz2 | |
am afe2b1fa: surfaceflinger: don\'t close fence fds after passing to queueBuffer
* commit 'afe2b1fadd29149ceed639357e44e06e97c3a5ca':
surfaceflinger: don't close fence fds after passing to queueBuffer
Diffstat (limited to 'services/surfaceflinger')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 419b246..96a8adb 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -3247,10 +3247,8 @@ status_t SurfaceFlinger::captureScreenImplLocked( } else { result = BAD_VALUE; } + // queueBuffer takes ownership of syncFd window->queueBuffer(window, buffer, syncFd); - if (syncFd != -1) { - close(syncFd); - } } } else { result = BAD_VALUE; |