commit 2628bc9d1261c2942f3506baca348ccd71ea9c86
author Igor Murashkin <iam@google.com> Thu May 02 23:03:48 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 02 23:03:48 2013 +0000
tree 9f52bb82430e2675376c8fa2f59672fde65dd40a
parent f2ae760602a948598a168ad43673bfbd9d50fc6b
parent 768b7d07e8c660d7b42b0f6b76da275821ee0adb

Merge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb-mr2-dev

services/camera/libcameraservice/camera2/ZslProcessor3.cpp

diff --git a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
index 88bcefb..be1ffeb 100644
--- a/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
+++ b/services/camera/libcameraservice/camera2/ZslProcessor3.cpp
@@ -305,7 +305,10 @@
 }
 
 status_t ZslProcessor3::clearZslQueueLocked() {
-    return mZslStream->clearInputRingBuffer();
+    if (mZslStream != 0) {
+        return mZslStream->clearInputRingBuffer();
+    }
+    return OK;
 }
 
 void ZslProcessor3::dump(int fd, const Vector<String16>& /*args*/) const {