Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-dev
diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 110a369..9cf34cd 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -13817,9 +13817,14 @@
<p>More specifically,<wbr/> this means that a size matching the
camera device's active array size is listed as a
supported size for the YUV_<wbr/>420_<wbr/>888 format in
-<a href="#static_android.scaler.streamConfigurationMap">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map</a>,<wbr/> and the
-minimum frame duration for that format and size is <=
-1/<wbr/>20 s.<wbr/></p>
+<a href="#static_android.scaler.streamConfigurationMap">android.<wbr/>scaler.<wbr/>stream<wbr/>Configuration<wbr/>Map</a>,<wbr/> the minimum frame
+duration for that format and size is <= 1/<wbr/>20 s,<wbr/> and
+the <a href="#static_android.control.aeAvailableTargetFpsRanges">android.<wbr/>control.<wbr/>ae<wbr/>Available<wbr/>Target<wbr/>Fps<wbr/>Ranges</a> entry
+lists at least one FPS range where the minimum FPS is</p>
+<blockquote>
+<p>= 1 /<wbr/> minimumFrameDuration for the maximum-size
+YUV_<wbr/>420_<wbr/>888 format.<wbr/></p>
+</blockquote>
<p>In addition,<wbr/> the <a href="#static_android.sync.maxLatency">android.<wbr/>sync.<wbr/>max<wbr/>Latency</a> field is
guaranted to have a value between 0 and 4,<wbr/> inclusive.<wbr/></p></span>
</li>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index e92dc39..a5b0243 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -3990,9 +3990,12 @@
More specifically, this means that a size matching the
camera device's active array size is listed as a
supported size for the YUV_420_888 format in
- android.scaler.streamConfigurationMap, and the
- minimum frame duration for that format and size is <=
- 1/20 s.
+ android.scaler.streamConfigurationMap, the minimum frame
+ duration for that format and size is <= 1/20 s, and
+ the android.control.aeAvailableTargetFpsRanges entry
+ lists at least one FPS range where the minimum FPS is
+ >= 1 / minimumFrameDuration for the maximum-size
+ YUV_420_888 format.
In addition, the android.sync.maxLatency field is
guaranted to have a value between 0 and 4, inclusive.