Merge "Camera3Device: Do not call cleanUpFailedRequest with mutex held" into mnc-dev (12129ccd) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3Device.cpp

+14 −10

Original line number	Diff line number	Diff line
		@@ -2765,12 +2765,14 @@ bool Camera3Device::RequestThread::threadLoop() {
		// error
		ALOGE("RequestThread: Can't get input buffer, skipping request:"
		" %s (%d)", strerror(-res), res);
		{
		Mutex::Autolock l(mRequestLock);
		if (mListener != NULL) {
		mListener->notifyError(
		ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST,
		nextRequest->mResultExtras);
		}
		}
		cleanUpFailedRequest(request, nextRequest, outputBuffers);
		return true;
		}
		@@ -2792,12 +2794,14 @@ bool Camera3Device::RequestThread::threadLoop() {
		// error
		ALOGE("RequestThread: Can't get output buffer, skipping request:"
		" %s (%d)", strerror(-res), res);
		{
		Mutex::Autolock l(mRequestLock);
		if (mListener != NULL) {
		mListener->notifyError(
		ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST,
		nextRequest->mResultExtras);
		}
		}
		cleanUpFailedRequest(request, nextRequest, outputBuffers);
		return true;
		}