summaryrefslogtreecommitdiff
path: root/include/gui/BufferQueueConsumer.h
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2016-12-06 15:07:48 -0800
committer Bill Yi <byi@google.com> 2016-12-06 15:07:48 -0800
commitecea1bfeae1211f9a363925c172c0f23062107fb (patch)
tree99d7fc7c78f261a3ffde997e8354f8134c60bfbe /include/gui/BufferQueueConsumer.h
parentf5c3b20f062ca646572ee6c07713eba691971c95 (diff)
parent6079aa6a8a845d8312435fe3e991bbe14588d018 (diff)
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Diffstat (limited to 'include/gui/BufferQueueConsumer.h')
-rw-r--r--include/gui/BufferQueueConsumer.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/gui/BufferQueueConsumer.h b/include/gui/BufferQueueConsumer.h
index c655f2af70..e2bafec4a9 100644
--- a/include/gui/BufferQueueConsumer.h
+++ b/include/gui/BufferQueueConsumer.h
@@ -136,6 +136,13 @@ public:
// Retrieve the sideband buffer stream, if any.
virtual sp<NativeHandle> getSidebandStream() const;
+ // See IGraphicBufferConsumer::getOccupancyHistory
+ virtual status_t getOccupancyHistory(bool forceFlush,
+ std::vector<OccupancyTracker::Segment>* outHistory) override;
+
+ // See IGraphicBufferConsumer::discardFreeBuffers
+ virtual status_t discardFreeBuffers() override;
+
// dump our state in a String
virtual void dumpState(String8& result, const char* prefix) const;