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

Commit b8cc2c21 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by android-build-merger
Browse files

Merge changes from topic 'enableZslApi' into oc-dev am: 9414a255 

am: fe04ad53

Change-Id: Ia0f9272d92b90abf660e2515785fb519c9e87153
parents 36b01e64 fe04ad53

core/java/android/hardware/camera2/CameraDevice.java

+3 −1
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ public abstract class CameraDevice implements AutoCloseable { 
    /**

     * Create a request suitable for zero shutter lag still capture. This means

     * means maximizing image quality without compromising preview frame rate.

     * AE/AWB/AF should be on auto mode.

     * AE/AWB/AF should be on auto mode. This is intended for application-operated ZSL. For

     * device-operated ZSL, use {@link CaptureRequest#CONTROL_ENABLE_ZSL} if available.

     * This template is guaranteed to be supported on camera devices that support the

     * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_PRIVATE_REPROCESSING PRIVATE_REPROCESSING}

     * capability or the
@@ -115,6 +116,7 @@ public abstract class CameraDevice implements AutoCloseable { 
     * capability.

     *

     * @see #createCaptureRequest

     * @see CaptureRequest#CONTROL_ENABLE_ZSL

     */

    public static final int TEMPLATE_ZERO_SHUTTER_LAG = 5;

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

+1 −0
Original line number Diff line number Diff line
@@ -1669,6 +1669,7 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <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>For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</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

+1 −0
Original line number Diff line number Diff line
@@ -2174,6 +2174,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <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>For application-operated ZSL, use CAMERA3_TEMPLATE_ZERO_SHUTTER_LAG template.</p>

     * <p><b>Optional</b> - This value may be {@code null} on some devices.</p>

     *

     * @see CaptureRequest#CONTROL_CAPTURE_INTENT