am 5977851b: am 00afb817: Merge "libgui: Plumb detachBuffer through ConsumerBase"

* commit '5977851b80549f24cd9164ec075b79c6c6291fa5':
  libgui: Plumb detachBuffer through ConsumerBase
This commit is contained in:
Dan Stoza 2015-04-07 22:58:47 +00:00 committed by Android Git Automerger
commit 172ff24ccb
2 changed files with 18 additions and 0 deletions

View File

@ -76,6 +76,9 @@ public:
// when a new frame becomes available.
void setFrameAvailableListener(const wp<FrameAvailableListener>& listener);
// See IGraphicBufferConsumer::detachBuffer
status_t detachBuffer(int slot);
private:
ConsumerBase(const ConsumerBase&);
void operator=(const ConsumerBase&);

View File

@ -163,6 +163,21 @@ void ConsumerBase::setFrameAvailableListener(
mFrameAvailableListener = listener;
}
status_t ConsumerBase::detachBuffer(int slot) {
CB_LOGV("detachBuffer");
Mutex::Autolock lock(mMutex);
status_t result = mConsumer->detachBuffer(slot);
if (result != NO_ERROR) {
CB_LOGE("Failed to detach buffer: %d", result);
return result;
}
freeBufferLocked(slot);
return result;
}
void ConsumerBase::dump(String8& result) const {
dump(result, "");
}