commit ec654e0318d8462a35b89e6acf369ffe1ea4ec81
author Jason Lee <jasl@google.com> Mon Sep 20 17:31:27 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 20 17:31:27 2021 +0000
tree a3b318da8369c7a99be758b4ec93ee18d3cdb282
parent 603493de20e55171175528c31d4367c90adf4905
parent a8471122ab052bc0344e2ff8094aeee473aa861e

Remove pending shutter/metadata for ErrorRequest am: a8471122ab

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/camera/+/15848890

Change-Id: I45165de75a0789988a29572f32a5e7a19bc1f03a

common/hal/utils/result_dispatcher.cc

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 @@
   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);
   }