diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2014-07-23 17:17:59 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2014-07-28 14:32:41 -0700 |
| commit | a8ea2e2438b79a1ab63e31bbad1d1172ad5f8d42 (patch) | |
| tree | 2654f2db2e7b23341f3fc61e24f72cb6acdb1586 /services/camera/libcameraservice/device1/CameraHardwareInterface.h | |
| parent | dc82fae19a4b8eebbdf4139699e0216aced312d3 (diff) | |
| download | frameworks_av-a8ea2e2438b79a1ab63e31bbad1d1172ad5f8d42.zip frameworks_av-a8ea2e2438b79a1ab63e31bbad1d1172ad5f8d42.tar.gz frameworks_av-a8ea2e2438b79a1ab63e31bbad1d1172ad5f8d42.tar.bz2 | |
CameraService: Clean up availability listeners and HAL error codes
- Refactor where availability listeners are called to centralize behavior,
ensuring that all client creation/destruction invokes the listeners
- Clean up some of the client hierarchy
- Filter error codes from key HAL calls to ensure proper reporting
Bug: 16514157
Bug: 16483222
Change-Id: I59875a865b6a508b47423946c78862da8df34cd1
Diffstat (limited to 'services/camera/libcameraservice/device1/CameraHardwareInterface.h')
| -rw-r--r-- | services/camera/libcameraservice/device1/CameraHardwareInterface.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device1/CameraHardwareInterface.h b/services/camera/libcameraservice/device1/CameraHardwareInterface.h index 2746f6f..6386838 100644 --- a/services/camera/libcameraservice/device1/CameraHardwareInterface.h +++ b/services/camera/libcameraservice/device1/CameraHardwareInterface.h @@ -105,8 +105,8 @@ public: CAMERA_DEVICE_API_VERSION_1_0, (hw_device_t **)&mDevice); } else { - rc = module->methods->open(module, mName.string(), - (hw_device_t **)&mDevice); + rc = CameraService::filterOpenErrorCode(module->methods->open( + module, mName.string(), (hw_device_t **)&mDevice)); } if (rc != OK) { ALOGE("Could not open camera %s: %d", mName.string(), rc); |