am e3b05d09: Merge "Tweaks for forward-compatibility" (75e3e493) · Commits · e / os / android_frameworks_native

include/gui/SurfaceTexture.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ struct SurfaceTexture {
		void incStrong(android::sp<android::SurfaceTexture>* const) {}
		void getTransformMatrix(float mtx[16]) {}
		void setFrameAvailableListener(const sp<FrameAvailableListener>&) {}
		void setSynchronousMode(bool) {}
		};

		static sp<SurfaceTexture> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz)

+2 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,8 @@ public:

		GraphicBuffer();

		GraphicBuffer(android_native_buffer_t*, bool);

		// creates w * h buffer
		GraphicBuffer(uint32_t w, uint32_t h, PixelFormat format, uint32_t usage);

+1 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,7 @@ typedef struct android_native_buffer_t
		void* reserved_proc[8];
		} android_native_buffer_t;

		#define ANativeWindowBuffer android_native_buffer_t

		/*****************************************************************************/

+13 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,19 @@ GraphicBuffer::GraphicBuffer()
		handle = NULL;
		}

		GraphicBuffer::GraphicBuffer(android_native_buffer_t*, bool)
		: BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),
		mInitCheck(NO_ERROR), mIndex(-1)
		{
		width =
		height =
		stride =
		format =
		usage = 0;
		transform = 0;
		handle = NULL;
		}

		GraphicBuffer::GraphicBuffer(uint32_t w, uint32_t h,
		PixelFormat reqFormat, uint32_t reqUsage)
		: BASE(), mOwner(ownData), mBufferMapper(GraphicBufferMapper::get()),