diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2016-12-22 14:55:02 -0800 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2017-01-05 14:50:47 -0800 |
| commit | 9c6dbd5979398ae62ef14a5b872474835f5fcaa3 (patch) | |
| tree | c46e1d34d56642e4448582d893b7137c806dba21 /camera/device/3.2/default/CameraDevice.cpp | |
| parent | 2d9f144f75af3c209551def568b5114d7149cd15 (diff) | |
Camera: patching treble camera HAL
Bug fixes like deadlock resolution, wrong enum usage etc.
Bug: 30985004
Test: run Camera2 API CTS tests on Angler
Change-Id: I661fa9197f66344ddecca8f68d343c891806eca1
Diffstat (limited to 'camera/device/3.2/default/CameraDevice.cpp')
| -rw-r--r-- | camera/device/3.2/default/CameraDevice.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/device/3.2/default/CameraDevice.cpp b/camera/device/3.2/default/CameraDevice.cpp index 51a29ec7b6..18e0e7bb87 100644 --- a/camera/device/3.2/default/CameraDevice.cpp +++ b/camera/device/3.2/default/CameraDevice.cpp @@ -212,7 +212,7 @@ Return<void> CameraDevice::open(const sp<ICameraDeviceCallback>& callback, open_ if (res != OK) { ALOGE("%s: cannot open camera %s!", __FUNCTION__, mCameraId.c_str()); mLock.unlock(); - _hidl_cb(Status::INTERNAL_ERROR, nullptr); + _hidl_cb(getHidlStatus(res), nullptr); return Void(); } |