diff options
| author | Chien-Yu Chen <cychen@google.com> | 2015-02-25 16:04:22 -0800 |
|---|---|---|
| committer | Chien-Yu Chen <cychen@google.com> | 2015-03-03 14:07:57 -0800 |
| commit | d231fd61ca94441183abda9766ce6906a5b4c3cf (patch) | |
| tree | 67dd34bd33fd1fcddb9182b34d5ddc754a259d16 /services/camera/libcameraservice/device2 | |
| parent | 88da526d97442c80731e01bfc94c6b47c4b0c3c7 (diff) | |
| download | frameworks_av-d231fd61ca94441183abda9766ce6906a5b4c3cf.zip frameworks_av-d231fd61ca94441183abda9766ce6906a5b4c3cf.tar.gz frameworks_av-d231fd61ca94441183abda9766ce6906a5b4c3cf.tar.bz2 | |
camera: implement flashlight for HAL v1 devices
Implement flashlight for HAL v1 devices and remove
CameraHardwareInterface's dependency on CameraService to avoid
circular dependency.
Bug: 2682206
Change-Id: Id5bbccef085b607a6189763fd7fbe2e3f26868c8
Diffstat (limited to 'services/camera/libcameraservice/device2')
| -rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp index be66c4d..43c8307 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.cpp +++ b/services/camera/libcameraservice/device2/Camera2Device.cpp @@ -68,8 +68,7 @@ status_t Camera2Device::initialize(CameraModule *module) camera2_device_t *device; - res = CameraService::filterOpenErrorCode(module->open( - name, reinterpret_cast<hw_device_t**>(&device))); + res = module->open(name, reinterpret_cast<hw_device_t**>(&device)); if (res != OK) { ALOGE("%s: Could not open camera %d: %s (%d)", __FUNCTION__, |