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/api2 | |
| 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/api2')
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 2 | ||||
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 6a1ee44..acc092c 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -71,7 +71,7 @@ CameraDeviceClient::CameraDeviceClient(const sp<CameraService>& cameraService, ALOGI("CameraDeviceClient %d: Opened", cameraId); } -status_t CameraDeviceClient::initialize(camera_module_t *module) +status_t CameraDeviceClient::initialize(CameraModule *module) { ATRACE_CALL(); status_t res; diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.h b/services/camera/libcameraservice/api2/CameraDeviceClient.h index 84e46b7..e687175 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.h +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.h @@ -119,7 +119,7 @@ public: int servicePid); virtual ~CameraDeviceClient(); - virtual status_t initialize(camera_module_t *module); + virtual status_t initialize(CameraModule *module); virtual status_t dump(int fd, const Vector<String16>& args); |