summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-09-11 21:40:11 -0700
committerIgor Murashkin <iam@google.com>2013-09-11 21:43:50 -0700
commit9ea4ae67fb10a10c464db8372b58bfe574cac03d (patch)
tree054c392353c953cc0313613ca1cf239dc8ad281e /core/java/android/hardware
parentba85b970f3ae7fd58c9a631e64bff0d05b787b9b (diff)
downloadframeworks_base-9ea4ae67fb10a10c464db8372b58bfe574cac03d.zip
frameworks_base-9ea4ae67fb10a10c464db8372b58bfe574cac03d.tar.gz
frameworks_base-9ea4ae67fb10a10c464db8372b58bfe574cac03d.tar.bz2
camera_metadata: add android.lens.state MOVING enum value
Bug: 10621609 Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2
Diffstat (limited to 'core/java/android/hardware')
-rw-r--r--core/java/android/hardware/camera2/CameraMetadata.java5
-rw-r--r--core/java/android/hardware/camera2/CaptureResult.java1
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 70d777f..f99dade 100644
--- a/core/java/android/hardware/camera2/CameraMetadata.java
+++ b/core/java/android/hardware/camera2/CameraMetadata.java
@@ -1757,6 +1757,11 @@ public class CameraMetadata implements Parcelable, AutoCloseable {
*/
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 bd151a2..2b951bb 100644
--- a/core/java/android/hardware/camera2/CaptureResult.java
+++ b/core/java/android/hardware/camera2/CaptureResult.java
@@ -576,6 +576,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);