Merge "Camera: check return value of callback" into pi-dev (6efdef72) · Commits · e / os / android_hardware_interfaces

camera/device/3.2/default/CameraDeviceSession.cpp

+15 −3

Original line number	Diff line number	Diff line
		@@ -393,7 +393,11 @@ void CameraDeviceSession::ResultBatcher::sendBatchShutterCbsLocked(
		return;
		}

		mCallback->notify(batch->mShutterMsgs);
		auto ret = mCallback->notify(batch->mShutterMsgs);
		if (!ret.isOk()) {
		ALOGE("%s: notify shutter transaction failed: %s",
		__FUNCTION__, ret.description().c_str());
		}
		batch->mShutterDelivered = true;
		batch->mShutterMsgs.clear();
		}
		@@ -563,7 +567,11 @@ void CameraDeviceSession::ResultBatcher::sendBatchMetadataLocked(
		}

		void CameraDeviceSession::ResultBatcher::notifySingleMsg(NotifyMsg& msg) {
		mCallback->notify({msg});
		auto ret = mCallback->notify({msg});
		if (!ret.isOk()) {
		ALOGE("%s: notify transaction failed: %s",
		__FUNCTION__, ret.description().c_str());
		}
		return;
		}

		@@ -654,7 +662,11 @@ void CameraDeviceSession::ResultBatcher::invokeProcessCaptureResultCallback(
		}
		}
		}
		mCallback->processCaptureResult(results);
		auto ret = mCallback->processCaptureResult(results);
		if (!ret.isOk()) {
		ALOGE("%s: processCaptureResult transaction failed: %s",
		__FUNCTION__, ret.description().c_str());
		}
		mProcessCaptureResultLock.unlock();
		}