summaryrefslogtreecommitdiff
path: root/libs/gui/BufferItemConsumer.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/BufferItemConsumer.cpp
parent9e99fce820c2d520f5618cb620cc1e37aed57b9d (diff)
parent955c8974820ce98a291b3f251cc60ca4ea578511 (diff)
Merge "libgui: Remove IGBC::BufferItem" into stage-aosp-master
Diffstat (limited to 'libs/gui/BufferItemConsumer.cpp')
-rw-r--r--libs/gui/BufferItemConsumer.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/libs/gui/BufferItemConsumer.cpp b/libs/gui/BufferItemConsumer.cpp
index fb978ddf0a..194121f289 100644
--- a/libs/gui/BufferItemConsumer.cpp
+++ b/libs/gui/BufferItemConsumer.cpp
@@ -53,7 +53,7 @@ void BufferItemConsumer::setName(const String8& name) {
mConsumer->setConsumerName(name);
}
-status_t BufferItemConsumer::acquireBuffer(BufferQueue::BufferItem *item,
+status_t BufferItemConsumer::acquireBuffer(BufferItem *item,
nsecs_t presentWhen, bool waitForFence) {
status_t err;
@@ -83,17 +83,6 @@ status_t BufferItemConsumer::acquireBuffer(BufferQueue::BufferItem *item,
return OK;
}
-status_t BufferItemConsumer::acquireBuffer(android::BufferItem* outItem,
- nsecs_t presentWhen, bool waitForFence) {
- BufferQueue::BufferItem item;
- status_t result = acquireBuffer(&item, presentWhen, waitForFence);
- if (result != NO_ERROR) {
- return result;
- }
- *outItem = item;
- return NO_ERROR;
-}
-
status_t BufferItemConsumer::releaseBuffer(const BufferItem &item,
const sp<Fence>& releaseFence) {
status_t err;