diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-01-30 10:29:02 -0800 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2015-03-17 19:23:39 -0700 |
| commit | 2f9c62f3e838f358bd5921270d7b1dec39e0a974 (patch) | |
| tree | 5f149371ebfbdde6b7dd83eeccf1fcd0a8250800 /services/camera/libcameraservice/api1/Camera2Client.cpp | |
| parent | 2563313c8f9cdbb0237a814e6d89b1932264d225 (diff) | |
| download | frameworks_av-2f9c62f3e838f358bd5921270d7b1dec39e0a974.zip frameworks_av-2f9c62f3e838f358bd5921270d7b1dec39e0a974.tar.gz frameworks_av-2f9c62f3e838f358bd5921270d7b1dec39e0a974.tar.bz2 | |
CameraService: intercept Camera module
Wrap camera module returned from HAL so get_camera_info returns
static_camera_characteristics processed by framework, which
generates keys added after HAL3.2 is released.
Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
Diffstat (limited to 'services/camera/libcameraservice/api1/Camera2Client.cpp')
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index dcab4ad..c129f6f 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -67,7 +67,7 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, mLegacyMode = legacyMode; } -status_t Camera2Client::initialize(camera_module_t *module) +status_t Camera2Client::initialize(CameraModule *module) { ATRACE_CALL(); ALOGV("%s: Initializing client for camera %d", __FUNCTION__, mCameraId); |