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

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

Merge "camera2: Fix template requirements" into oc-dev 

am: 2976109d

Change-Id: I20b68b33caf48afeead56116602c6a9b2a33ab26
parents adec8518 2976109d

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

+12 −4
Original line number Diff line number Diff line
@@ -73,8 +73,10 @@ public abstract class CameraDevice implements AutoCloseable { 
     * Create a request suitable for still image capture. Specifically, this

     * means prioritizing image quality over frame rate. These requests would

     * commonly be used with the {@link CameraCaptureSession#capture} method.

     * This template is guaranteed to be supported on all camera devices.

     *

     * This template is guaranteed to be supported on all camera devices except

     * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT DEPTH_OUTPUT} devices

     * that are not {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE

     * BACKWARD_COMPATIBLE}.

     * @see #createCaptureRequest

     */

    public static final int TEMPLATE_STILL_CAPTURE = 2;
@@ -84,7 +86,10 @@ public abstract class CameraDevice implements AutoCloseable { 
     * that a stable frame rate is used, and post-processing is set for

     * recording quality. These requests would commonly be used with the

     * {@link CameraCaptureSession#setRepeatingRequest} method.

     * This template is guaranteed to be supported on all camera devices.

     * This template is guaranteed to be supported on all camera devices except

     * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT DEPTH_OUTPUT} devices

     * that are not {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE

     * BACKWARD_COMPATIBLE}.

     *

     * @see #createCaptureRequest

     */
@@ -98,7 +103,10 @@ public abstract class CameraDevice implements AutoCloseable { 
     * {@link #TEMPLATE_RECORD} is is in use with {@link CameraCaptureSession#setRepeatingRequest}.

     * This template is guaranteed to be supported on all camera devices except

     * legacy devices ({@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL}

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY})

     * {@code == }{@link CameraMetadata#INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY LEGACY}) and

     * {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT DEPTH_OUTPUT} devices

     * that are not {@link CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE

     * BACKWARD_COMPATIBLE}.

     *

     * @see #createCaptureRequest

     */