diff options
| author | Igor Murashkin <iam@google.com> | 2013-09-12 18:21:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 18:21:15 +0000 |
| commit | 6c62163976844b28859fca322b28af907ec2856d (patch) | |
| tree | 5ec6fcb014767e80ccdc758a4ab2b81a048e2f1d /core/java/android/hardware | |
| parent | a2906cb4d9355b7a08e7fdec1924c2dbc7fda622 (diff) | |
| parent | 9ea4ae67fb10a10c464db8372b58bfe574cac03d (diff) | |
| download | frameworks_base-6c62163976844b28859fca322b28af907ec2856d.zip frameworks_base-6c62163976844b28859fca322b28af907ec2856d.tar.gz frameworks_base-6c62163976844b28859fca322b28af907ec2856d.tar.bz2 | |
Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/CameraMetadata.java | 5 | ||||
| -rw-r--r-- | core/java/android/hardware/camera2/CaptureResult.java | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 18fffc0..361e7de 100644 --- a/core/java/android/hardware/camera2/CameraMetadata.java +++ b/core/java/android/hardware/camera2/CameraMetadata.java @@ -1119,6 +1119,11 @@ public abstract class CameraMetadata { */ public static final int LENS_STATE_STATIONARY = 0; + /** + * @see CaptureResult#LENS_STATE + */ + public static final int LENS_STATE_MOVING = 1; + // // Enumeration values for CaptureResult#STATISTICS_SCENE_FLICKER // diff --git a/core/java/android/hardware/camera2/CaptureResult.java b/core/java/android/hardware/camera2/CaptureResult.java index f83dad7..3fcd2f9 100644 --- a/core/java/android/hardware/camera2/CaptureResult.java +++ b/core/java/android/hardware/camera2/CaptureResult.java @@ -587,6 +587,7 @@ public final class CaptureResult extends CameraMetadata { * Current lens status * </p> * @see #LENS_STATE_STATIONARY + * @see #LENS_STATE_MOVING */ public static final Key<Integer> LENS_STATE = new Key<Integer>("android.lens.state", int.class); |