Merge "camera: Clarify ZSL supports" into oc-dev

am: 5da5ad056c

Change-Id: I1b4b1401f4e7ba61bfd1647f93203e591c987ef4

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 96a16e4..e861312 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -4300,6 +4300,7 @@ TEMPLATE_<wbr/>STILL_<wbr/>CAPTURE template may be <code>true</code>.<wbr/> The
 <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>
 
@@ -9032,6 +9033,7 @@ TEMPLATE_<wbr/>STILL_<wbr/>CAPTURE template may be <code>true</code>.<wbr/> The
 <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>
 

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index f2fa1a8..f800efe 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -2831,6 +2831,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           For applications targeting SDK versions older than O, the value of enableZsl in all
           capture templates is always `false` if present.
+
+          For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.
           </details>
           <hal_details>
           It is valid for HAL to produce regular output images for requests with STILL_CAPTURE

diff --git a/camera/docs/ndk_metadata_properties.xml b/camera/docs/ndk_metadata_properties.xml
index 6eb95f7..cb346f3 100644 (file)
--- a/camera/docs/ndk_metadata_properties.xml
+++ b/camera/docs/ndk_metadata_properties.xml
@@ -2849,6 +2849,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           For applications targeting SDK versions older than O, the value of enableZsl in all
           capture templates is always `false` if present.
+
+          For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.
           </details>
           <hal_details>
           It is valid for HAL to produce regular output images for requests with STILL_CAPTURE