Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c621639: Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-dev

Browse Source 
* commit '6c62163976844b28859fca322b28af907ec2856d':
  camera_metadata: add android.lens.state MOVING enum value
This commit is contained in:
Igor Murashkin
2013-09-12 11:26:16 -07:00
committed by Android Git Automerger
parent 179ba0c04b 6c62163976
commit ddc74f5ed1
3 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -10965,6 +10965,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

5
core/java/android/hardware/camera2/CameraMetadata.java
View File

@@ -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
//

1
core/java/android/hardware/camera2/CaptureResult.java
View File

@@ -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);