summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-05-13 16:34:05 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-05-13 16:34:07 +0000
commit09d561dbee9a28db9632ff3d51f633c18aefe023 (patch)
treef7a506ad537346fbaa00564db15328992de40d26 /libs/gui/ConsumerBase.cpp
parent4b4820db4b83875ec5bbae11e468f36f21e5334c (diff)
parenta4650a50a0b35e9e4342d6600b6eb24fd94bb8e5 (diff)
Merge "Fix PTS handling for buffer replacement" into mnc-dev
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;
}