Merge "Clean up duplicate lambda in cameraserver device3 code." (bde85898) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3Device.cpp

+7 −8

Original line number	Diff line number	Diff line
		@@ -3918,18 +3918,17 @@ status_t Camera3Device::HalInterface::processBatchCaptureRequests(
		}

		hardware::details::return_status err;
		if (hidlSession_3_4 != nullptr) {
		err = hidlSession_3_4->processCaptureRequest_3_4(captureRequests_3_4, cachesToRemove,
		auto resultCallback =
		[&status, &numRequestProcessed] (auto s, uint32_t n) {
		status = s;
		*numRequestProcessed = n;
		});
		};
		if (hidlSession_3_4 != nullptr) {
		err = hidlSession_3_4->processCaptureRequest_3_4(captureRequests_3_4, cachesToRemove,
		resultCallback);
		} else {
		err = mHidlSession->processCaptureRequest(captureRequests, cachesToRemove,
		[&status, &numRequestProcessed] (auto s, uint32_t n) {
		status = s;
		*numRequestProcessed = n;
		});
		resultCallback);
		}
		if (!err.isOk()) {
		ALOGE("%s: Transaction error: %s", __FUNCTION__, err.description().c_str());