diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-07-07 17:05:38 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-07-08 14:13:16 +0000 |
| commit | 0ea8fa4ccbf9b2b179370b983f3887d3daf2381f (patch) | |
| tree | 7c513124746228beab5a262424fcbdd2a00018c7 /services/camera/libcameraservice/common | |
| parent | d8cbe4a024ef54adf043b6ea31fa22271b8b2c51 (diff) | |
| download | frameworks_av-0ea8fa4ccbf9b2b179370b983f3887d3daf2381f.zip frameworks_av-0ea8fa4ccbf9b2b179370b983f3887d3daf2381f.tar.gz frameworks_av-0ea8fa4ccbf9b2b179370b983f3887d3daf2381f.tar.bz2 | |
Camera3: Add capture intent for ZSL capture
Also fix the warning condition in input buffer return path.
Change-Id: I90e9edc1db9f1de87bc8936000b00c3306160c71
Diffstat (limited to 'services/camera/libcameraservice/common')
| -rw-r--r-- | services/camera/libcameraservice/common/CameraDeviceBase.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/common/CameraDeviceBase.h b/services/camera/libcameraservice/common/CameraDeviceBase.h index 7597b10..c7bd886 100644 --- a/services/camera/libcameraservice/common/CameraDeviceBase.h +++ b/services/camera/libcameraservice/common/CameraDeviceBase.h @@ -26,6 +26,7 @@ #include <camera/camera2/ICameraDeviceCallbacks.h> #include "hardware/camera2.h" +#include "hardware/camera3.h" #include "camera/CameraMetadata.h" #include "camera/CaptureResult.h" |