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

Commit 9ef8c1f7 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

Merge "Camera: Update API docs" into main

parents 0758ffb5 5909d0ff

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

+6 −2
Original line number Diff line number Diff line
@@ -3402,8 +3402,8 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
            new Key<Long>("android.sensor.exposureTime", long.class);



    /**

     * <p>Duration from start of frame exposure to

     * start of next frame exposure.</p>

     * <p>Duration from start of frame readout to

     * start of next frame readout.</p>

     * <p>The maximum frame rate that can be supported by a camera subsystem is

     * a function of many factors:</p>

     * <ul>
@@ -3464,6 +3464,10 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <p>For more details about stalling, see {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputStallDuration }.</p>

     * <p>This control is only effective if {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} is set to

     * OFF; otherwise the auto-exposure algorithm will override this value.</p>

     * <p><em>Note:</em> Prior to Android 13, this field was described as measuring the duration from

     * start of frame exposure to start of next frame exposure, which doesn't reflect the

     * definition from sensor manufacturer. A mobile sensor defines the frame duration as

     * intervals between sensor readouts.</p>

     * <p><b>Units</b>: Nanoseconds</p>

     * <p><b>Range of valid values:</b><br>

     * See {@link CameraCharacteristics#SENSOR_INFO_MAX_FRAME_DURATION android.sensor.info.maxFrameDuration}, {@link android.hardware.camera2.params.StreamConfigurationMap }.

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

+6 −2
Original line number Diff line number Diff line
@@ -4103,8 +4103,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
            new Key<Long>("android.sensor.exposureTime", long.class);



    /**

     * <p>Duration from start of frame exposure to

     * start of next frame exposure.</p>

     * <p>Duration from start of frame readout to

     * start of next frame readout.</p>

     * <p>The maximum frame rate that can be supported by a camera subsystem is

     * a function of many factors:</p>

     * <ul>
@@ -4165,6 +4165,10 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p>For more details about stalling, see {@link android.hardware.camera2.params.StreamConfigurationMap#getOutputStallDuration }.</p>

     * <p>This control is only effective if {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} or {@link CaptureRequest#CONTROL_MODE android.control.mode} is set to

     * OFF; otherwise the auto-exposure algorithm will override this value.</p>

     * <p><em>Note:</em> Prior to Android 13, this field was described as measuring the duration from

     * start of frame exposure to start of next frame exposure, which doesn't reflect the

     * definition from sensor manufacturer. A mobile sensor defines the frame duration as

     * intervals between sensor readouts.</p>

     * <p><b>Units</b>: Nanoseconds</p>

     * <p><b>Range of valid values:</b><br>

     * See {@link CameraCharacteristics#SENSOR_INFO_MAX_FRAME_DURATION android.sensor.info.maxFrameDuration}, {@link android.hardware.camera2.params.StreamConfigurationMap }.