diff options
author | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-01-30 10:29:02 -0800 |
---|---|---|
committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2015-02-03 15:23:56 -0800 |
commit | e074a93046ebe5cea0b55c3a479e082a426e1e07 (patch) | |
tree | c1b960cf44d005a19e8609e5be3d3f47c4ad0366 /services/camera/libcameraservice/api1/CameraClient.cpp | |
parent | 16469200f5a94277178ea41ed59898a113320b60 (diff) | |
download | frameworks_av-e074a93046ebe5cea0b55c3a479e082a426e1e07.zip frameworks_av-e074a93046ebe5cea0b55c3a479e082a426e1e07.tar.gz frameworks_av-e074a93046ebe5cea0b55c3a479e082a426e1e07.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/CameraClient.cpp')
-rw-r--r-- | services/camera/libcameraservice/api1/CameraClient.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp index bbb2fe0..6bea3b6 100644 --- a/services/camera/libcameraservice/api1/CameraClient.cpp +++ b/services/camera/libcameraservice/api1/CameraClient.cpp @@ -59,7 +59,7 @@ CameraClient::CameraClient(const sp<CameraService>& cameraService, LOG1("CameraClient::CameraClient X (pid %d, id %d)", callingPid, cameraId); } -status_t CameraClient::initialize(camera_module_t *module) { +status_t CameraClient::initialize(CameraModule *module) { int callingPid = getCallingPid(); status_t res; @@ -75,7 +75,7 @@ status_t CameraClient::initialize(camera_module_t *module) { snprintf(camera_device_name, sizeof(camera_device_name), "%d", mCameraId); mHardware = new CameraHardwareInterface(camera_device_name); - res = mHardware->initialize(&module->common); + res = mHardware->initialize(module); if (res != OK) { ALOGE("%s: Camera %d: unable to initialize device: %s (%d)", __FUNCTION__, mCameraId, strerror(-res), res); |