Merge "Fix documentation for AHardwareBuffer_(to|from)HardwareBuffer." into... (c324d31e) · Commits · e / os / platform_frameworks_native

include/android/hardware_buffer_jni.h

+16 −8

Original line number	Diff line number	Diff line
		@@ -14,8 +14,14 @@
		* limitations under the License.
		*/

		/**
		* @addtogroup AHardwareBuffer
		* @{
		*/

		/**
		* @file hardware_buffer_jni.h
		* @brief JNI glue for native hardware buffers.
		*/

		#ifndef ANDROID_HARDWARE_BUFFER_JNI_H
		@@ -30,23 +36,25 @@
		__BEGIN_DECLS

		/**
		* Return the AHardwareBuffer associated with a Java HardwareBuffer object,
		* for interacting with it through native code. This method does not acquire any
		* additional reference to the AHardwareBuffer that is returned. To keep the
		* AHardwareBuffer live after the Java HardwareBuffer object got garbage
		* collected, be sure to use AHardwareBuffer_acquire() to acquire an additional
		* reference.
		* Return the AHardwareBuffer wrapped by a Java HardwareBuffer object.
		*
		* This method does not acquire any additional reference to the AHardwareBuffer
		* that is returned. To keep the AHardwareBuffer live after the Java
		* HardwareBuffer object got garbage collected, be sure to use AHardwareBuffer_acquire()
		* to acquire an additional reference.
		*/
		AHardwareBuffer* AHardwareBuffer_fromHardwareBuffer(JNIEnv* env,
		jobject hardwareBufferObj);
		jobject hardwareBufferObj) __INTRODUCED_IN(26);

		/**
		* Return a new Java HardwareBuffer object that wraps the passed native
		* AHardwareBuffer object.
		*/
		jobject AHardwareBuffer_toHardwareBuffer(JNIEnv* env,
		AHardwareBuffer* hardwareBuffer);
		AHardwareBuffer* hardwareBuffer) __INTRODUCED_IN(26);

		__END_DECLS

		#endif // ANDROID_HARDWARE_BUFFER_JNI_H

		/** @} */