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

Commit 43a4dffd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "camera2: Add links for aeState" into pi-dev

parents d3820877 c9ca722f

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

+4 −2
Original line number Diff line number Diff line
@@ -1435,9 +1435,11 @@ public abstract class CameraMetadata<TKey> { 
     * for the external flash. Otherwise, this mode acts like ON.</p>

     * <p>When the external flash is turned off, AE mode should be changed to one of the

     * other available AE modes.</p>

     * <p>If the camera device supports AE external flash mode, aeState must be

     * FLASH_REQUIRED after the camera device finishes AE scan and it's too dark without

     * <p>If the camera device supports AE external flash mode, {@link CaptureResult#CONTROL_AE_STATE android.control.aeState} must

     * be FLASH_REQUIRED after the camera device finishes AE scan and it's too dark without

     * flash.</p>

     *

     * @see CaptureResult#CONTROL_AE_STATE

     * @see CaptureRequest#CONTROL_AE_MODE

     */

    public static final int CONTROL_AE_MODE_ON_EXTERNAL_FLASH = 5;

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

+3 −2
Original line number Diff line number Diff line
@@ -1001,8 +1001,8 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * </tbody>

     * </table>

     * <p>If the camera device supports AE external flash mode (ON_EXTERNAL_FLASH is included in

     * {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_MODES android.control.aeAvailableModes}), aeState must be FLASH_REQUIRED after the camera device

     * finishes AE scan and it's too dark without flash.</p>

     * {@link CameraCharacteristics#CONTROL_AE_AVAILABLE_MODES android.control.aeAvailableModes}), {@link CaptureResult#CONTROL_AE_STATE android.control.aeState} must be FLASH_REQUIRED after

     * the camera device finishes AE scan and it's too dark without flash.</p>

     * <p>For the above table, the camera device may skip reporting any state changes that happen

     * without application intervention (i.e. mode switch, trigger, locking). Any state that

     * can be skipped in that manner is called a transient state.</p>
@@ -1081,6 +1081,7 @@ public class CaptureResult extends CameraMetadata<CaptureResult.Key<?>> { 
     * @see CaptureRequest#CONTROL_AE_LOCK

     * @see CaptureRequest#CONTROL_AE_MODE

     * @see CaptureRequest#CONTROL_AE_PRECAPTURE_TRIGGER

     * @see CaptureResult#CONTROL_AE_STATE

     * @see CaptureRequest#CONTROL_MODE

     * @see CaptureRequest#CONTROL_SCENE_MODE

     * @see CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL