commit | b10cdadf0fb945e23ca77008d4af76584bd0e39a | [log] [tgz] |
---|---|---|
author | Zhijun He <zhijunhe@google.com> | Mon Jun 16 16:38:35 2014 -0700 |
committer | Zhijun He <zhijunhe@google.com> | Thu Jun 19 15:41:09 2014 -0700 |
tree | d1fd0cc1c42aec025e8f6fc52f890b96e7203653 | |
parent | ab5cdbaf65ca509681d2726aacdf3ac8bfb6b3fa [diff] [blame] |
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
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 @@ 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,