diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-07-07 21:36:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-07 21:36:47 +0000 |
| commit | 384a04d93622c764bf1e8a69c288957d78b6a4e4 (patch) | |
| tree | 074efc9228c492ce84a00ac99def4ebdbeb0a443 /api | |
| parent | 6826b25c223c91d603f3a8e2b0d1ce5abe1e13e5 (diff) | |
| parent | 0dd17509a953774039c0e73beac4b0546504c774 (diff) | |
| download | frameworks_base-384a04d93622c764bf1e8a69c288957d78b6a4e4.zip frameworks_base-384a04d93622c764bf1e8a69c288957d78b6a4e4.tar.gz frameworks_base-384a04d93622c764bf1e8a69c288957d78b6a4e4.tar.bz2 | |
Merge "Camera: Add ZERO_SHUTTER_LAG modes to noise reduction and edge enhancement" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 2905e17..c6b2c28 100644 --- a/api/current.txt +++ b/api/current.txt @@ -13440,6 +13440,7 @@ package android.hardware.camera2 { field public static final int EDGE_MODE_FAST = 1; // 0x1 field public static final int EDGE_MODE_HIGH_QUALITY = 2; // 0x2 field public static final int EDGE_MODE_OFF = 0; // 0x0 + field public static final int EDGE_MODE_ZERO_SHUTTER_LAG = 3; // 0x3 field public static final int FLASH_MODE_OFF = 0; // 0x0 field public static final int FLASH_MODE_SINGLE = 1; // 0x1 field public static final int FLASH_MODE_TORCH = 2; // 0x2 @@ -13468,6 +13469,7 @@ package android.hardware.camera2 { field public static final int NOISE_REDUCTION_MODE_HIGH_QUALITY = 2; // 0x2 field public static final int NOISE_REDUCTION_MODE_MINIMAL = 3; // 0x3 field public static final int NOISE_REDUCTION_MODE_OFF = 0; // 0x0 + field public static final int NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG = 4; // 0x4 field public static final int REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE = 0; // 0x0 field public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; // 0x6 field public static final int REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO = 9; // 0x9 diff --git a/api/system-current.txt b/api/system-current.txt index 150b569..4e76475 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -13780,6 +13780,7 @@ package android.hardware.camera2 { field public static final int EDGE_MODE_FAST = 1; // 0x1 field public static final int EDGE_MODE_HIGH_QUALITY = 2; // 0x2 field public static final int EDGE_MODE_OFF = 0; // 0x0 + field public static final int EDGE_MODE_ZERO_SHUTTER_LAG = 3; // 0x3 field public static final int FLASH_MODE_OFF = 0; // 0x0 field public static final int FLASH_MODE_SINGLE = 1; // 0x1 field public static final int FLASH_MODE_TORCH = 2; // 0x2 @@ -13808,6 +13809,7 @@ package android.hardware.camera2 { field public static final int NOISE_REDUCTION_MODE_HIGH_QUALITY = 2; // 0x2 field public static final int NOISE_REDUCTION_MODE_MINIMAL = 3; // 0x3 field public static final int NOISE_REDUCTION_MODE_OFF = 0; // 0x0 + field public static final int NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG = 4; // 0x4 field public static final int REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE = 0; // 0x0 field public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; // 0x6 field public static final int REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO = 9; // 0x9 |