commit 13f01cbdbd34779a234bc674df79e23672fd5c0b
author Jesse Hall <jessehall@google.com> Wed Mar 20 11:37:21 2013 -0700
committer Jesse Hall <jessehall@google.com> Fri Mar 22 09:56:58 2013 -0700
tree 9b1c9334f276ff039a2621fe0e639ff06249473c
parent 8d8c75976171d194ca8f94727b22e3bf7676b9dd

Pass sp<Fence>s around instead of file descriptors

Change-Id: Iac70584a2207940730e8f803a543e4e9a4000c47

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 83ab38e..c35ac95 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -140,14 +140,12 @@
     }
 }
 
-void FramebufferSurface::onFrameCommitted(int fenceFd) {
-    if (fenceFd >= 0) {
-        sp<Fence> fence(new Fence(fenceFd));
-        if (mCurrentBufferSlot != BufferQueue::INVALID_BUFFER_SLOT) {
-            status_t err = addReleaseFence(mCurrentBufferSlot, fence);
-            ALOGE_IF(err, "setReleaseFenceFd: failed to add the fence: %s (%d)",
-                    strerror(-err), err);
-        }
+void FramebufferSurface::onFrameCommitted(const sp<Fence>& fence) {
+    if (fence->isValid() &&
+            mCurrentBufferSlot != BufferQueue::INVALID_BUFFER_SLOT) {
+        status_t err = addReleaseFence(mCurrentBufferSlot, fence);
+        ALOGE_IF(err, "setReleaseFenceFd: failed to add the fence: %s (%d)",
+                strerror(-err), err);
     }
 }