commit b05eeaedacaff92b6e5ac89f99b0fccdf7643f09
author Zhijun He <zhijunhe@google.com> Thu Jun 06 13:51:22 2013 -0700
committer Zhijun He <zhijunhe@google.com> Thu Jun 06 13:51:22 2013 -0700
tree 47f3ac7e031b9c57657c40de9a57997edf4f4706
parent 62a8f67f33faf19d0ff815672dd19bb71dd0d650

camera3: Fix crash in set error state.

When camera open fails in camera3device initialize call, setErrorStateLockedV()
tries to access RequestThread object that is not created yet.

Bug: 9319518
Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727

services/camera/libcameraservice/Camera3Device.cpp

diff --git a/services/camera/libcameraservice/Camera3Device.cpp b/services/camera/libcameraservice/Camera3Device.cpp
index 0b5e9c4..c7edb76 100644
--- a/services/camera/libcameraservice/Camera3Device.cpp
+++ b/services/camera/libcameraservice/Camera3Device.cpp
@@ -1125,7 +1125,7 @@
     ALOGE("Camera %d: %s", mId, errorCause.string());
 
     // But only do error state transition steps for the first error
-    if (mStatus == STATUS_ERROR) return;
+    if (mStatus == STATUS_ERROR || mStatus == STATUS_UNINITIALIZED) return;
 
     mErrorCause = errorCause;