commit d231fd61ca94441183abda9766ce6906a5b4c3cf
author Chien-Yu Chen <cychen@google.com> Wed Feb 25 16:04:22 2015 -0800
committer Chien-Yu Chen <cychen@google.com> Tue Mar 03 14:07:57 2015 -0800
tree 67dd34bd33fd1fcddb9182b34d5ddc754a259d16
parent 88da526d97442c80731e01bfc94c6b47c4b0c3c7

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

services/camera/libcameraservice/device1/CameraHardwareInterface.h

diff --git a/services/camera/libcameraservice/device1/CameraHardwareInterface.h b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
index 9e1cdc9..f5ebbf8 100644
--- a/services/camera/libcameraservice/device1/CameraHardwareInterface.h
+++ b/services/camera/libcameraservice/device1/CameraHardwareInterface.h
@@ -104,8 +104,7 @@
                                      CAMERA_DEVICE_API_VERSION_1_0,
                                      (hw_device_t **)&mDevice);
         } else {
-            rc = CameraService::filterOpenErrorCode(module->open(
-                    mName.string(), (hw_device_t **)&mDevice));
+            rc = module->open(mName.string(), (hw_device_t **)&mDevice);
         }
         if (rc != OK) {
             ALOGE("Could not open camera %s: %d", mName.string(), rc);