diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-09 21:57:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-09 21:57:38 -0700 |
| commit | 2b0db6aea3be519334f340ca97581db902196690 (patch) | |
| tree | 4f10f3af7541bc957551e421664b2363a3fec070 | |
| parent | 73125afc0333c9aba37749e605537342caca11cd (diff) | |
| parent | 44f120fa169cb3131ec853c638ea9c88a9b33b97 (diff) | |
| download | frameworks_av-2b0db6aea3be519334f340ca97581db902196690.zip frameworks_av-2b0db6aea3be519334f340ca97581db902196690.tar.gz frameworks_av-2b0db6aea3be519334f340ca97581db902196690.tar.bz2 | |
Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
| -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; } |