summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-05-13 18:04:10 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-05-13 18:04:10 +0000
commitac8611db6a9b42cd6b185a877c2f5d4e470e2e89 (patch)
tree4c43a2048544e05453e97b2b7d2ca08d7c4f6c5f /libs/gui/ConsumerBase.cpp
parenta1f8b3249549b4b38c087e8843167854250503b3 (diff)
parentf984bad94aa98f49a3959f3119114e94a547b9bf (diff)
am f984bad9: Merge "Fix PTS handling for buffer replacement"
* commit 'f984bad94aa98f49a3959f3119114e94a547b9bf': Fix PTS handling for buffer replacement
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
-rw-r--r--libs/gui/ConsumerBase.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index aa9443acfa..072ab44bc4 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -211,8 +211,8 @@ void ConsumerBase::dumpLocked(String8& result, const char* prefix) const {
}
status_t ConsumerBase::acquireBufferLocked(BufferItem *item,
- nsecs_t presentWhen) {
- status_t err = mConsumer->acquireBuffer(item, presentWhen);
+ nsecs_t presentWhen, uint64_t maxFrameNumber) {
+ status_t err = mConsumer->acquireBuffer(item, presentWhen, maxFrameNumber);
if (err != NO_ERROR) {
return err;
}