Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06d84c3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "camera: Update for enableZsl values in template" into oc-dev

parents 57b99960 1d72ee3b
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -1662,9 +1662,13 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>>
     * <p>The output images for request B may have contents captured before the output images for
     * request A, and the result metadata for request B may be older than the result metadata for
     * request A.</p>
     * <p>Note that when enableZsl is <code>true</code>, it is not guaranteed to get output images captured in the
     * past for requests with STILL_CAPTURE capture intent.</p>
     * <p>The value of enableZsl in capture templates is always <code>false</code> if present.</p>
     * <p>Note that when enableZsl is <code>true</code>, it is not guaranteed to get output images captured in
     * the past for requests with STILL_CAPTURE capture intent.</p>
     * <p>For applications targeting SDK versions O and newer, the value of enableZsl in
     * TEMPLATE_STILL_CAPTURE template may be <code>true</code>. The value in other templates is always
     * <code>false</code> if present.</p>
     * <p>For applications targeting SDK versions older than O, the value of enableZsl in all
     * capture templates is always <code>false</code> if present.</p>
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     *
     * @see CaptureRequest#CONTROL_CAPTURE_INTENT
+7 −3
Original line number Diff line number Diff line
@@ -2167,9 +2167,13 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> {
     * <p>The output images for request B may have contents captured before the output images for
     * request A, and the result metadata for request B may be older than the result metadata for
     * request A.</p>
     * <p>Note that when enableZsl is <code>true</code>, it is not guaranteed to get output images captured in the
     * past for requests with STILL_CAPTURE capture intent.</p>
     * <p>The value of enableZsl in capture templates is always <code>false</code> if present.</p>
     * <p>Note that when enableZsl is <code>true</code>, it is not guaranteed to get output images captured in
     * the past for requests with STILL_CAPTURE capture intent.</p>
     * <p>For applications targeting SDK versions O and newer, the value of enableZsl in
     * TEMPLATE_STILL_CAPTURE template may be <code>true</code>. The value in other templates is always
     * <code>false</code> if present.</p>
     * <p>For applications targeting SDK versions older than O, the value of enableZsl in all
     * capture templates is always <code>false</code> if present.</p>
     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>
     *
     * @see CaptureRequest#CONTROL_CAPTURE_INTENT