diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-09-12 19:06:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 19:06:55 +0000 |
| commit | 2d861e87ae556b73d8bab5a6db20207a5653560f (patch) | |
| tree | d61c51c3d506d3a37bbda974b5f144be330b8bfe /api | |
| parent | 184b17ddef985ba99f1b1ad8f660a742a9f31a19 (diff) | |
| parent | 986b1bd73f73e196bae1d97c3a255635ab2a2fcf (diff) | |
| download | frameworks_base-2d861e87ae556b73d8bab5a6db20207a5653560f.zip frameworks_base-2d861e87ae556b73d8bab5a6db20207a5653560f.tar.gz frameworks_base-2d861e87ae556b73d8bab5a6db20207a5653560f.tar.bz2 | |
Merge "Camera2: Fix build: Add new key to API" into klp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 35f5f09..45f02e2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10973,6 +10973,8 @@ package android.hardware.camera2 { field public static final int STATISTICS_FACE_DETECT_MODE_FULL = 2; // 0x2 field public static final int STATISTICS_FACE_DETECT_MODE_OFF = 0; // 0x0 field public static final int STATISTICS_FACE_DETECT_MODE_SIMPLE = 1; // 0x1 + field public static final int STATISTICS_LENS_SHADING_MAP_MODE_OFF = 0; // 0x0 + field public static final int STATISTICS_LENS_SHADING_MAP_MODE_ON = 1; // 0x1 field public static final int STATISTICS_SCENE_FLICKER_50HZ = 1; // 0x1 field public static final int STATISTICS_SCENE_FLICKER_60HZ = 2; // 0x2 field public static final int STATISTICS_SCENE_FLICKER_NONE = 0; // 0x0 @@ -11078,6 +11080,7 @@ package android.hardware.camera2 { field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_FRAME_DURATION; field public static final android.hardware.camera2.CameraMetadata.Key SENSOR_SENSITIVITY; field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_FACE_DETECT_MODE; + field public static final android.hardware.camera2.CameraMetadata.Key STATISTICS_LENS_SHADING_MAP_MODE; field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_CURVE_BLUE; field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_CURVE_GREEN; field public static final android.hardware.camera2.CameraMetadata.Key TONEMAP_CURVE_RED; |