summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-04-07 21:24:02 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-07 21:24:02 +0000
commit6d9e3dc5ca8e519218053f3f2f0e5068c835aba9 (patch)
tree6f46feb89d0c74b9324956cc6b921831e3737287 /libs/gui/ConsumerBase.cpp
parenteb3704a58e62c0f85cfea776df1040b677263c80 (diff)
parente55cae86e6217a86d94bf280c6c8442bef2dd908 (diff)
am e55cae86: Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
* commit 'e55cae86e6217a86d94bf280c6c8442bef2dd908': libgui: Remove IGBC::BufferItem
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
-rw-r--r--libs/gui/ConsumerBase.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index c8b5d0cb9f..b874e3a320 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -200,17 +200,6 @@ status_t ConsumerBase::acquireBufferLocked(BufferItem *item,
return OK;
}
-status_t ConsumerBase::acquireBufferLocked(BufferQueue::BufferItem *outItem,
- nsecs_t presentWhen) {
- BufferItem item;
- status_t result = acquireBufferLocked(&item, presentWhen);
- if (result != NO_ERROR) {
- return result;
- }
- *outItem = item;
- return NO_ERROR;
-}
-
status_t ConsumerBase::addReleaseFence(int slot,
const sp<GraphicBuffer> graphicBuffer, const sp<Fence>& fence) {
Mutex::Autolock lock(mMutex);