diff options
| author | 2017-04-13 20:30:48 +0000 | |
|---|---|---|
| committer | 2017-04-13 20:30:49 +0000 | |
| commit | 1b47dfd74909803eecb96e9e8a2695eebcc430a7 (patch) | |
| tree | a726a19e283ff4ee51276f6797baf3a62e5a4927 /include/gui/BufferQueueConsumer.h | |
| parent | 3a717993fa5a3abb6ddd9a5ad8ac11599d26287b (diff) | |
| parent | 4b5fbdb107cf25bf0cad040a63cf51399ce9215b (diff) | |
Merge changes Ica5f5f5c,Ifb7d2cec,Ia402b4bc,I9c3b6b7e,I36ba19c7, ... into oc-dev
* changes:
libgui: Make IGraphicBufferConsumer a SafeInterface
libbinder: Add vector<Parcelable> to SafeInterface
libbinder: Add sp<NativeHandle> to SafeInterface
libbinder: Support enums in SafeInterface
libbinder: Support sp<Flattenable> in SafeInterface
libbinder: Add int64_t/uint64_t to SafeInterface
libgui: Normalize IGraphicBufferConsumer methods
libgui: Format IGraphicBufferConsumer
Diffstat (limited to 'include/gui/BufferQueueConsumer.h')
| -rw-r--r-- | include/gui/BufferQueueConsumer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/gui/BufferQueueConsumer.h b/include/gui/BufferQueueConsumer.h index da574ec7d2..1e22d2823a 100644 --- a/include/gui/BufferQueueConsumer.h +++ b/include/gui/BufferQueueConsumer.h @@ -110,7 +110,7 @@ public: virtual status_t setMaxAcquiredBufferCount(int maxAcquiredBuffers); // setConsumerName sets the name used in logging - virtual void setConsumerName(const String8& name); + status_t setConsumerName(const String8& name) override; // setDefaultBufferFormat allows the BufferQueue to create // GraphicBuffers of a defaultFormat if no format is specified @@ -135,7 +135,7 @@ public: virtual status_t setTransformHint(uint32_t hint); // Retrieve the sideband buffer stream, if any. - virtual sp<NativeHandle> getSidebandStream() const; + status_t getSidebandStream(sp<NativeHandle>* outStream) const override; // See IGraphicBufferConsumer::getOccupancyHistory virtual status_t getOccupancyHistory(bool forceFlush, @@ -145,7 +145,7 @@ public: virtual status_t discardFreeBuffers() override; // dump our state in a String - virtual void dumpState(String8& result, const char* prefix) const; + status_t dumpState(const String8& prefix, String8* outResult) const override; // Functions required for backwards compatibility. // These will be modified/renamed in IGraphicBufferConsumer and will be |