diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-03-25 13:49:30 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-03-25 13:49:30 -0700 |
| commit | 8dda7273dbb4ff6eeffe7d4c3831e9b31b8e5ac1 (patch) | |
| tree | d9f63b7f2a5d8c8ed785758ea617e1c8c7b2e0b4 /core/java/android/hardware/camera2 | |
| parent | db0dca826d992af1adfa53e10c31f08d3197bb0b (diff) | |
| download | frameworks_base-8dda7273dbb4ff6eeffe7d4c3831e9b31b8e5ac1.zip frameworks_base-8dda7273dbb4ff6eeffe7d4c3831e9b31b8e5ac1.tar.gz frameworks_base-8dda7273dbb4ff6eeffe7d4c3831e9b31b8e5ac1.tar.bz2 | |
Camera2: Add partial flash state
Bug 13637334
Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
Diffstat (limited to 'core/java/android/hardware/camera2')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 25 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 1 |
2 files changed, 13 insertions, 13 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index a3fbfbe..42c8e3d 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -1625,38 +1625,37 @@ public abstract class CameraMetadata { // /** - * <p>No flash on camera</p> + * <p>No flash on camera.</p> * @see CaptureResult#FLASH_STATE */ public static final int FLASH_STATE_UNAVAILABLE = 0; /** - * <p>if {@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} is true Flash is - * charging and cannot be fired</p> - * - * @see CameraCharacteristics#FLASH_INFO_AVAILABLE + * <p>Flash is charging and cannot be fired.</p> * @see CaptureResult#FLASH_STATE */ public static final int FLASH_STATE_CHARGING = 1; /** - * <p>if {@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} is true Flash is - * ready to fire</p> - * - * @see CameraCharacteristics#FLASH_INFO_AVAILABLE + * <p>Flash is ready to fire.</p> * @see CaptureResult#FLASH_STATE */ public static final int FLASH_STATE_READY = 2; /** - * <p>if {@link CameraCharacteristics#FLASH_INFO_AVAILABLE android.flash.info.available} is true Flash fired - * for this capture</p> - * - * @see CameraCharacteristics#FLASH_INFO_AVAILABLE + * <p>Flash fired for this capture.</p> * @see CaptureResult#FLASH_STATE */ public static final int FLASH_STATE_FIRED = 3; + /** + * <p>Flash partially illuminated this frame. This is usually due to the next + * or previous frame having the flash fire, and the flash spilling into this capture + * due to hardware limitations.</p> + * @see CaptureResult#FLASH_STATE + */ + public static final int FLASH_STATE_PARTIAL = 4; + // // Enumeration values for CaptureResult#LENS_STATE // diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index 9bf1b98..b3bce3b 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -1164,6 +1164,7 @@ public final class CaptureResult extends CameraMetadata { * @see #FLASH_STATE_CHARGING * @see #FLASH_STATE_READY * @see #FLASH_STATE_FIRED + * @see #FLASH_STATE_PARTIAL */ public static final Key<Integer> FLASH_STATE = new Key<Integer>("android.flash.state", int.class); |