summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-04-07 21:16:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-04-07 21:16:33 +0000
commite55cae86e6217a86d94bf280c6c8442bef2dd908 (patch)
tree11f9d8e105c8825ae00001d489442434c57d0731 /libs/gui/ConsumerBase.cpp
parent9e99fce820c2d520f5618cb620cc1e37aed57b9d (diff)
parent955c8974820ce98a291b3f251cc60ca4ea578511 (diff)
Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
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);