Merge changes Ica5f5f5c,Ifb7d2cec,Ia402b4bc,I9c3b6b7e,I36ba19c7, ... into oc-dev am: 1b47dfd749 (581246e8) · Commits · e / os / android_frameworks_native-old

include/gui/BufferQueueConsumer.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -86,7 +86,7 @@ public:

		private:
		// Dump our state in a string
		void dumpState(String8& result, const char* prefix) const;
		void dumpState(const String8& prefix, String8* outResult) const;

		// getMinUndequeuedBufferCountLocked returns the minimum number of buffers
		// that must remain in a state other than DEQUEUED. The async parameter

+143 −159

File changed.

Preview size limit exceeded, changes collapsed.

+75 −1

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0