Merge "Camera NDK: Fix broken header doc links" (1465926f) · Commits · e / devices / smdk4412 / android_frameworks_av

camera/ndk/include/camera/NdkCameraManager.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,8 @@ camera_status_t ACameraManager_unregisterAvailabilityCallback(
		* Query the capabilities of a camera device. These capabilities are
		* immutable for a given camera.
		*
		* <p>See {@link ACameraMetadata} document and {@link NdkCameraMetadataTags.h} for more details.</p>
		* <p>See {@link ACameraMetadata} document and <a href="https://cs.android.com/android/platform/superproject/+/master:frameworks/av/camera/ndk/include/camera/NdkCameraMetadataTags.h">NdkCameraMetadataTags.h</a>
		* for more details.</p>
		*
		* <p>The caller must call {@link ACameraMetadata_free} to free the memory of the output
		* characteristics.</p>

camera/ndk/include/camera/NdkCameraMetadata.h

+9 −4

Original line number	Diff line number	Diff line
		@@ -96,9 +96,12 @@ typedef struct ACameraMetadata_entry {
		/**
		* The tag identifying the entry.
		*
		* <p> It is one of the values defined in {@link NdkCameraMetadataTags.h}, and defines how the
		* <p> It is one of the values defined in
		* <a href="https://cs.android.com/android/platform/superproject/+/master:frameworks/av/camera/ndk/include/camera/NdkCameraMetadataTags.h">NdkCameraMetadataTags.h</a>
		* , and defines how the
		* entry should be interpreted and which parts of the API provide it.
		* See {@link NdkCameraMetadataTags.h} for more details. </p>
		* See <a href="https://cs.android.com/android/platform/superproject/+/master:frameworks/av/camera/ndk/include/camera/NdkCameraMetadataTags.h">NdkCameraMetadataTags.h</a>
		* for more details. </p>
		*/
		uint32_t tag;

		@@ -141,9 +144,11 @@ typedef struct ACameraMetadata_const_entry {
		/**
		* The tag identifying the entry.
		*
		* <p> It is one of the values defined in {@link NdkCameraMetadataTags.h}, and defines how the
		* <p> It is one of the values defined in <a href="https://cs.android.com/android/platform/superproject/+/master:frameworks/av/camera/ndk/include/camera/NdkCameraMetadataTags.h">NdkCameraMetadataTags.h</a>
		* , and defines how the
		* entry should be interpreted and which parts of the API provide it.
		* See {@link NdkCameraMetadataTags.h} for more details. </p>
		* See <a href="https://cs.android.com/android/platform/superproject/+/master:frameworks/av/camera/ndk/include/camera/NdkCameraMetadataTags.h">NdkCameraMetadataTags.h</a>
		* for more details. </p>
		*/
		uint32_t tag;