From 9ea4ae67fb10a10c464db8372b58bfe574cac03d Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Wed, 11 Sep 2013 21:40:11 -0700 Subject: [PATCH] camera_metadata: add android.lens.state MOVING enum value Bug: 10621609 Change-Id: Ia4fa15db99350f920741f244ae7772520657fdd2 --- api/current.txt | 1 + core/java/android/hardware/camera2/CameraMetadata.java | 5 +++++ core/java/android/hardware/camera2/CaptureResult.java | 1 + 3 files changed, 7 insertions(+) diff --git a/api/current.txt b/api/current.txt index 97e4c0240cf42..26a9f0c6039a5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10958,6 +10958,7 @@ package android.hardware.camera2 { field public static final int LENS_FACING_FRONT = 0; // 0x0 field public static final int LENS_OPTICAL_STABILIZATION_MODE_OFF = 0; // 0x0 field public static final int LENS_OPTICAL_STABILIZATION_MODE_ON = 1; // 0x1 + field public static final int LENS_STATE_MOVING = 1; // 0x1 field public static final int LENS_STATE_STATIONARY = 0; // 0x0 field public static final int NOISE_REDUCTION_MODE_FAST = 1; // 0x1 field public static final int NOISE_REDUCTION_MODE_HIGH_QUALITY = 2; // 0x2 diff --git a/core/java/android/hardware/camera2/CameraMetadata.java b/core/java/android/hardware/camera2/CameraMetadata.java index 70d777f094e34..f99dade40972e 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 bd151a2272122..2b951bb07080f 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 *

* @see #LENS_STATE_STATIONARY + * @see #LENS_STATE_MOVING */ public static final Key LENS_STATE = new Key("android.lens.state", int.class);