commit 61675c0a7b5d88d5f525b1a1926fab6a7b2c7904
author Igor Murashkin <iam@google.com> Thu May 02 11:53:00 2013 -0700
committer Igor Murashkin <iam@google.com> Thu May 02 14:04:41 2013 -0700
tree d184ee5c49fd92306b1d9f528c9361a45d327aa5
parent 688492164e7d92618a1409b567f884bcbd9a5d02

camera3: Don't crash when taking a still capture with ZSL disabled

Bug: 8790212
Change-Id: I4bf7ac5ab856b0ea1738844182efb86137e14083

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 {