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

Commit 1d72ee3b authored Apr 18, 2017 by Chien-Yu Chen

camera: Update for enableZsl values in template

For apps targeting SDK versions O and newer, the value of enableZsl
may be true in still capture template. the value of enableZsl is
always false for other templates.

For apps targeting SDK versions older than O, the value of enableZsl
is always flase.

Test: make
Bug: 34983527
Change-Id: I23702ec49a460fc6877114384f85748c7c2ef6ba

parent 2359f016

core/java/android/hardware/camera2/CaptureRequest.java

+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

core/java/android/hardware/camera2/CaptureResult.java

+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