From b05eeaedacaff92b6e5ac89f99b0fccdf7643f09 Mon Sep 17 00:00:00 2001 From: Zhijun He Date: Thu, 6 Jun 2013 13:51:22 -0700 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services') 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 @@ void Camera3Device::setErrorStateLockedV(const char *fmt, va_list args) { 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; -- cgit v1.1