Commit b0864b6a authored May 02, 2013 by Igor Murashkin Committed by Android Git Automerger May 02, 2013

am f9539bb7: am 2628bc9d: Merge "camera3: Don\'t crash when taking a still...

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

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

parents 7888fe50 f9539bb7

services/camera/libcameraservice/camera2/ZslProcessor3.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -305,8 +305,11 @@ status_t ZslProcessor3::clearZslQueue() {
		}

		status_t ZslProcessor3::clearZslQueueLocked() {
		if (mZslStream != 0) {
		return mZslStream->clearInputRingBuffer();
		}
		return OK;
		}

		void ZslProcessor3::dump(int fd, const Vector<String16>& /args/) const {
		Mutex::Autolock l(mInputMutex);