Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 06d84c3a86

Change-Id: I49afc64341f4bb53287991a48535ad2108afce3f
This commit is contained in:
Chien-Yu Chen
2017-04-24 22:41:49 +00:00
committed by android-build-merger
parent 8ec71a639b 06d84c3a86
commit 2fd83ae977
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/hardware/camera2/CaptureRequest.java
View File

@@ -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

10
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -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