diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-10 08:39:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 08:39:58 -0700 |
| commit | b01ba8ff3cceee0f6573f18e5d1cd9535069c395 (patch) | |
| tree | e8d47313ba5e92e5519cec571eeab5530062693d /services/camera | |
| parent | fab610de0151c955a8cb18695d5cd3ae88c77b88 (diff) | |
| parent | 0d19b574cc9f12c4c042cb7070757e3c85c7301f (diff) | |
| download | frameworks_av-b01ba8ff3cceee0f6573f18e5d1cd9535069c395.zip frameworks_av-b01ba8ff3cceee0f6573f18e5d1cd9535069c395.tar.gz frameworks_av-b01ba8ff3cceee0f6573f18e5d1cd9535069c395.tar.bz2 | |
am 4c7b3129: am 2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
* commit '4c7b312964b2430ccc1f99e99092cc870be2a293':
Camera: Clear Hardware device pointer when initialization fails
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index 5b59ef9..7e199fa 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -73,6 +73,7 @@ status_t CameraClient::initialize(camera_module_t *module) { if (res != OK) { ALOGE("%s: Camera %d: unable to initialize device: %s (%d)", __FUNCTION__, mCameraId, strerror(-res), res); + mHardware.clear(); return NO_INIT; } |