diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-06-16 16:38:35 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-06-19 15:41:09 -0700 |
| commit | b10cdadf0fb945e23ca77008d4af76584bd0e39a (patch) | |
| tree | d1fd0cc1c42aec025e8f6fc52f890b96e7203653 /services/camera/libcameraservice/api1/CameraClient.cpp | |
| parent | ab5cdbaf65ca509681d2726aacdf3ac8bfb6b3fa (diff) | |
| download | frameworks_av-b10cdadf0fb945e23ca77008d4af76584bd0e39a.zip frameworks_av-b10cdadf0fb945e23ca77008d4af76584bd0e39a.tar.gz frameworks_av-b10cdadf0fb945e23ca77008d4af76584bd0e39a.tar.bz2 | |
cameraservice: Implement HAL1 and higher HAL API coexistence
A higher hal version device like HAL3.2 can be opened as HAL1.0 device
if HAL supports it. This only applies to camera API1.
Change-Id: I4ae9f59f4317158cc1bd7ed7726e4032cdd1fa07
Diffstat (limited to 'services/camera/libcameraservice/api1/CameraClient.cpp')
| -rw-r--r-- | services/camera/libcameraservice/api1/CameraClient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/CameraClient.cpp b/services/camera/libcameraservice/api1/CameraClient.cpp index 30b7bb8..517226d 100644 --- a/services/camera/libcameraservice/api1/CameraClient.cpp +++ b/services/camera/libcameraservice/api1/CameraClient.cpp @@ -79,7 +79,7 @@ status_t CameraClient::initialize(camera_module_t *module) { ALOGE("%s: Camera %d: unable to initialize device: %s (%d)", __FUNCTION__, mCameraId, strerror(-res), res); mHardware.clear(); - return NO_INIT; + return res; } mHardware->setCallbacks(notifyCallback, |