diff options
| author | 2016-12-01 23:35:05 +0000 | |
|---|---|---|
| committer | 2016-12-01 23:35:05 +0000 | |
| commit | f7dfa47683c4810c2955affe26db0e9454614cf7 (patch) | |
| tree | 6ce03514ad74651a0400a655b0b8cfea8c6305f5 /libs/gui/ConsumerBase.cpp | |
| parent | 4a1f8a53aa0d51486f47ca3d2699e600e540a12a (diff) | |
| parent | 3546a3f08ad84099db4006d651c656d58d2ed566 (diff) | |
Merge "Fix FenceTracker releaseFence"
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
| -rw-r--r-- | libs/gui/ConsumerBase.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index 3cf3078345..be2b1afd36 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -56,7 +56,8 @@ static int32_t createProcessUniqueId() { ConsumerBase::ConsumerBase(const sp<IGraphicBufferConsumer>& bufferQueue, bool controlledByApp) : mAbandoned(false), - mConsumer(bufferQueue) { + mConsumer(bufferQueue), + mPrevFinalReleaseFence(Fence::NO_FENCE) { // Choose a name using the PID and a process-unique ID. mName = String8::format("unnamed-%d-%d", getpid(), createProcessUniqueId()); @@ -366,6 +367,7 @@ status_t ConsumerBase::releaseBufferLocked( freeBufferLocked(slot); } + mPrevFinalReleaseFence = mSlots[slot].mFence; mSlots[slot].mFence = Fence::NO_FENCE; return err; |