diff options
| author | 2012-06-22 19:45:10 -0700 | |
|---|---|---|
| committer | 2012-06-22 19:45:10 -0700 | |
| commit | a277b7a4d7fa162d2d88f4701d44cedbe6dbfc56 (patch) | |
| tree | 9624b3d718e065747bedff50cb969151d675a471 /libs/ui/Fence.cpp | |
| parent | 37815d16f6eac2d19783c9234a04d62635d81bbc (diff) | |
| parent | ef19414bd8b77a26f5751f3845be79025a8263fe (diff) | |
Merge "Transfer HWC release fences to BufferQueue"
Diffstat (limited to 'libs/ui/Fence.cpp')
| -rw-r--r-- | libs/ui/Fence.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp index 993585b034..5c17d10e78 100644 --- a/libs/ui/Fence.cpp +++ b/libs/ui/Fence.cpp @@ -26,6 +26,8 @@ namespace android { +const sp<Fence> Fence::NO_FENCE = sp<Fence>(); + Fence::Fence() : mFenceFd(-1) { } @@ -55,7 +57,7 @@ sp<Fence> Fence::merge(const String8& name, const sp<Fence>& f1, if (result == -1) { ALOGE("merge: sync_merge returned an error: %s (%d)", strerror(-errno), errno); - return sp<Fence>(); + return NO_FENCE; } return sp<Fence>(new Fence(result)); } |