From a8471122ab052bc0344e2ff8094aeee473aa861e Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Fri, 17 Sep 2021 11:03:10 +0900 Subject: Remove pending shutter/metadata for ErrorRequest Bug: 195968593 Test: checklist Change-Id: I6e27ab8db541f80f002674587efdd83689cad574 --- common/hal/utils/result_dispatcher.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/hal/utils/result_dispatcher.cc b/common/hal/utils/result_dispatcher.cc index 6443e8f..6c8b2de 100644 --- a/common/hal/utils/result_dispatcher.cc +++ b/common/hal/utils/result_dispatcher.cc @@ -273,11 +273,13 @@ status_t ResultDispatcher::AddError(const ErrorMessage& error) { uint32_t frame_number = error.frame_number; // No need to deliver the shutter message on an error if (error.error_code == ErrorCode::kErrorDevice || - error.error_code == ErrorCode::kErrorResult) { + error.error_code == ErrorCode::kErrorResult || + error.error_code == ErrorCode::kErrorRequest) { pending_shutters_.erase(frame_number); } // No need to deliver the result metadata on a result metadata error - if (error.error_code == ErrorCode::kErrorResult) { + if (error.error_code == ErrorCode::kErrorResult || + error.error_code == ErrorCode::kErrorRequest) { pending_final_metadata_.erase(frame_number); } -- cgit v1.2.3