commit 18b466790aa0a55ff4282ed8b5e550e58e0444b2
author Eric Laurent <elaurent@google.com> Fri Jun 07 15:52:59 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 07 15:52:59 2013 +0000
tree 059c3fb09c4880c1fc47bf72b61df46315c3f5db
parent b05eeaedacaff92b6e5ac89f99b0fccdf7643f09
parent 7e1139c0377b6806942fb2a043737b3b9cf0ae91

Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev

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;