commit 6dd2ccb095376c54c3154f59ef61dd346c8bea91
author Xin Li <delphij@google.com> Fri Aug 13 20:38:50 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 13 20:38:50 2021 +0000
tree b26d0bf3de789b2e5387fc848b5eedb60a882e8c
parent 508132d5829268f32c337f58386519de662f2bc6
parent 5daa0885a194fbf3d64b9e1876c7dc022b8873f2

Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev

camera/ndk/include/camera/NdkCameraMetadataTags.h

diff --git a/camera/ndk/include/camera/NdkCameraMetadataTags.h b/camera/ndk/include/camera/NdkCameraMetadataTags.h
index 52cd4b4..86781e5 100644
--- a/camera/ndk/include/camera/NdkCameraMetadataTags.h
+++ b/camera/ndk/include/camera/NdkCameraMetadataTags.h
@@ -9005,7 +9005,12 @@
      * <code>android.scaler.streamConfigurationMap</code> describes the streams supported in 'default'
      * mode.
      * The stream configurations supported in 'max resolution' mode are described by
-     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.</p>
+     * <code>android.scaler.streamConfigurationMapMaximumResolution</code>.
+     * The maximum resolution mode pixel array size of a camera device
+     * (<code>ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE</code>) with this capability,
+     * will be at least 24 megapixels.</p>
+     *
+     * @see ACAMERA_SENSOR_INFO_PIXEL_ARRAY_SIZE
      */
     ACAMERA_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR
                                                                       = 16,