Snap for 4378450 from 3984754b77a90c90ac427f7585893fc26ca627aa to oc-mr1-release

[android-x86/system-media.git] / camera / docs / docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index cd32beb..1f14157 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -4293,9 +4293,14 @@ capture intents.<wbr/></p>
 <p>The output images for request B may have contents captured before the output images for
 request A,<wbr/> and the result metadata for request B may be older than the result metadata for
 request A.<wbr/></p>
-<p>Note that when enableZsl is <code>true</code>,<wbr/> it is not guaranteed to get output images captured in the
-past for requests with STILL_<wbr/>CAPTURE capture intent.<wbr/></p>
-<p>The value of enableZsl in capture templates is always <code>false</code> if present.<wbr/></p>
+<p>Note that when enableZsl is <code>true</code>,<wbr/> it is not guaranteed to get output images captured in
+the past for requests with STILL_<wbr/>CAPTURE capture intent.<wbr/></p>
+<p>For applications targeting SDK versions O and newer,<wbr/> the value of enableZsl in
+TEMPLATE_<wbr/>STILL_<wbr/>CAPTURE template may be <code>true</code>.<wbr/> The value in other templates is always
+<code>false</code> if present.<wbr/></p>
+<p>For applications targeting SDK versions older than O,<wbr/> the value of enableZsl in all
+capture templates is always <code>false</code> if present.<wbr/></p>
+<p>For application-operated ZSL,<wbr/> use CAMERA3_<wbr/>TEMPLATE_<wbr/>ZERO_<wbr/>SHUTTER_<wbr/>LAG template.<wbr/></p>
             </td>
           </tr>
 
@@ -9021,9 +9026,14 @@ capture intents.<wbr/></p>
 <p>The output images for request B may have contents captured before the output images for
 request A,<wbr/> and the result metadata for request B may be older than the result metadata for
 request A.<wbr/></p>
-<p>Note that when enableZsl is <code>true</code>,<wbr/> it is not guaranteed to get output images captured in the
-past for requests with STILL_<wbr/>CAPTURE capture intent.<wbr/></p>
-<p>The value of enableZsl in capture templates is always <code>false</code> if present.<wbr/></p>
+<p>Note that when enableZsl is <code>true</code>,<wbr/> it is not guaranteed to get output images captured in
+the past for requests with STILL_<wbr/>CAPTURE capture intent.<wbr/></p>
+<p>For applications targeting SDK versions O and newer,<wbr/> the value of enableZsl in
+TEMPLATE_<wbr/>STILL_<wbr/>CAPTURE template may be <code>true</code>.<wbr/> The value in other templates is always
+<code>false</code> if present.<wbr/></p>
+<p>For applications targeting SDK versions older than O,<wbr/> the value of enableZsl in all
+capture templates is always <code>false</code> if present.<wbr/></p>
+<p>For application-operated ZSL,<wbr/> use CAMERA3_<wbr/>TEMPLATE_<wbr/>ZERO_<wbr/>SHUTTER_<wbr/>LAG template.<wbr/></p>
             </td>
           </tr>
 
@@ -16127,8 +16137,8 @@ in <a href="#static_android.request.availableCapabilities">android.<wbr/>request
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>Vendor tags must not be listed here.<wbr/> Use the vendor tag metadata
-extensions C api instead (refer to camera3.<wbr/>h for more details).<wbr/></p>
+              <p>Vendor tags can be listed here.<wbr/> Vendor tag metadata should also
+use the extensions C api (refer to camera3.<wbr/>h for more details).<wbr/></p>
 <p>Setting/<wbr/>getting vendor tags will be checked against the metadata
 vendor extensions API and not against this field.<wbr/></p>
 <p>The HAL must not consume any request tags that are not listed either
@@ -16210,8 +16220,8 @@ in <a href="#static_android.request.availableCapabilities">android.<wbr/>request
               <p>Tags listed here must always have an entry in the result metadata,<wbr/>
 even if that size is 0 elements.<wbr/> Only array-type tags (e.<wbr/>g.<wbr/> lists,<wbr/>
 matrices,<wbr/> strings) are allowed to have 0 elements.<wbr/></p>
-<p>Vendor tags must not be listed here.<wbr/> Use the vendor tag metadata
-extensions C api instead (refer to camera3.<wbr/>h for more details).<wbr/></p>
+<p>Vendor tags can be listed here.<wbr/> Vendor tag metadata should also
+use the extensions C api (refer to camera3.<wbr/>h for more details).<wbr/></p>
 <p>Setting/<wbr/>getting vendor tags will be checked against the metadata
 vendor extensions API and not against this field.<wbr/></p>
 <p>The HAL must not produce any result tags that are not listed either
@@ -16281,8 +16291,8 @@ details.<wbr/></p>
               <p>Keys listed here must always have an entry in the static info metadata,<wbr/>
 even if that size is 0 elements.<wbr/> Only array-type tags (e.<wbr/>g.<wbr/> lists,<wbr/>
 matrices,<wbr/> strings) are allowed to have 0 elements.<wbr/></p>
-<p>Vendor tags must not be listed here.<wbr/> Use the vendor tag metadata
-extensions C api instead (refer to camera3.<wbr/>h for more details).<wbr/></p>
+<p>Vendor tags can listed here.<wbr/> Vendor tag metadata should also use
+the extensions C api (refer to camera3.<wbr/>h for more details).<wbr/></p>
 <p>Setting/<wbr/>getting vendor tags will be checked against the metadata
 vendor extensions API and not against this field.<wbr/></p>
 <p>The HAL must not have any tags in its static info that are not listed