commit 291b7e7a8fa2e1292f817eba1a4ec27352a74ef0
author Jayant Chowdhary <jchowdhary@google.com> Fri Sep 24 23:59:09 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 24 23:59:09 2021 +0000
tree 6f4254c5aeef219c2e42e470374629b51dfcbbc3
parent a8471122ab052bc0344e2ff8094aeee473aa861e
parent 0d13d96db23c7ac1d243f096ab6b3324780ceae2

Merge "EmulatedCamera: Fix scaler crop region default for maximum resolution sensor pixel mode results." into sc-qpr1-dev

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