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

Commit f6002bc0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update AE_MODE_ON description for flash control." into main

parents 2ec87b11 d86efc2a

core/java/android/hardware/camera2/CameraMetadata.java

+10 −0
Original line number Diff line number Diff line
@@ -2270,7 +2270,17 @@ public abstract class CameraMetadata<TKey> { 
     * {@link CaptureRequest#SENSOR_FRAME_DURATION android.sensor.frameDuration} are ignored. The

     * application has control over the various

     * android.flash.* fields.</p>

     * <p>If the device supports manual flash strength control, i.e.,

     * if {@link CameraCharacteristics#FLASH_SINGLE_STRENGTH_MAX_LEVEL android.flash.singleStrengthMaxLevel} and

     * {@link CameraCharacteristics#FLASH_TORCH_STRENGTH_MAX_LEVEL android.flash.torchStrengthMaxLevel} are greater than 1, then

     * the auto-exposure (AE) precapture metering sequence should be

     * triggered for the configured flash mode and strength to avoid

     * the image being incorrectly exposed at different

     * {@link CaptureRequest#FLASH_STRENGTH_LEVEL android.flash.strengthLevel}.</p>

     *

     * @see CameraCharacteristics#FLASH_SINGLE_STRENGTH_MAX_LEVEL

     * @see CaptureRequest#FLASH_STRENGTH_LEVEL

     * @see CameraCharacteristics#FLASH_TORCH_STRENGTH_MAX_LEVEL

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_SENSITIVITY

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

+11 −0
Original line number Diff line number Diff line
@@ -1358,6 +1358,13 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * camera device auto-exposure routine for the overridden

     * fields for a given capture will be available in its

     * CaptureResult.</p>

     * <p>When {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} is AE_MODE_ON and if the device

     * supports manual flash strength control, i.e.,

     * if {@link CameraCharacteristics#FLASH_SINGLE_STRENGTH_MAX_LEVEL android.flash.singleStrengthMaxLevel} and

     * {@link CameraCharacteristics#FLASH_TORCH_STRENGTH_MAX_LEVEL android.flash.torchStrengthMaxLevel} are greater than 1, then

     * the auto-exposure (AE) precapture metering sequence should be

     * triggered to avoid the image being incorrectly exposed at

     * different {@link CaptureRequest#FLASH_STRENGTH_LEVEL android.flash.strengthLevel}.</p>

     * <p><b>Possible values:</b></p>

     * <ul>

     *   <li>{@link #CONTROL_AE_MODE_OFF OFF}</li>
@@ -1373,9 +1380,13 @@ public final class CaptureRequest extends CameraMetadata<CaptureRequest.Key<?>> 
     * <p>This key is available on all devices.</p>

     *

     * @see CameraCharacteristics#CONTROL_AE_AVAILABLE_MODES

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#CONTROL_MODE

     * @see CameraCharacteristics#FLASH_INFO_AVAILABLE

     * @see CaptureRequest#FLASH_MODE

     * @see CameraCharacteristics#FLASH_SINGLE_STRENGTH_MAX_LEVEL

     * @see CaptureRequest#FLASH_STRENGTH_LEVEL

     * @see CameraCharacteristics#FLASH_TORCH_STRENGTH_MAX_LEVEL

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_SENSITIVITY

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

+11 −0
Original line number Diff line number Diff line
@@ -759,6 +759,13 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * camera device auto-exposure routine for the overridden

     * fields for a given capture will be available in its

     * CaptureResult.</p>

     * <p>When {@link CaptureRequest#CONTROL_AE_MODE android.control.aeMode} is AE_MODE_ON and if the device

     * supports manual flash strength control, i.e.,

     * if {@link CameraCharacteristics#FLASH_SINGLE_STRENGTH_MAX_LEVEL android.flash.singleStrengthMaxLevel} and

     * {@link CameraCharacteristics#FLASH_TORCH_STRENGTH_MAX_LEVEL android.flash.torchStrengthMaxLevel} are greater than 1, then

     * the auto-exposure (AE) precapture metering sequence should be

     * triggered to avoid the image being incorrectly exposed at

     * different {@link CaptureRequest#FLASH_STRENGTH_LEVEL android.flash.strengthLevel}.</p>

     * <p><b>Possible values:</b></p>

     * <ul>

     *   <li>{@link #CONTROL_AE_MODE_OFF OFF}</li>
@@ -774,9 +781,13 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * <p>This key is available on all devices.</p>

     *

     * @see CameraCharacteristics#CONTROL_AE_AVAILABLE_MODES

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#CONTROL_MODE

     * @see CameraCharacteristics#FLASH_INFO_AVAILABLE

     * @see CaptureRequest#FLASH_MODE

     * @see CameraCharacteristics#FLASH_SINGLE_STRENGTH_MAX_LEVEL

     * @see CaptureRequest#FLASH_STRENGTH_LEVEL

     * @see CameraCharacteristics#FLASH_TORCH_STRENGTH_MAX_LEVEL

     * @see CaptureRequest#SENSOR_EXPOSURE_TIME

     * @see CaptureRequest#SENSOR_FRAME_DURATION

     * @see CaptureRequest#SENSOR_SENSITIVITY