summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-20 23:07:05 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-09-20 23:07:05 +0000
commit00397ced44ab452c7a35c402d7f699442733653f (patch)
tree420a83f56e9302227f344e37b212eb4e42a9dc91
parenta904173aba3e3a53f176369ded033d6cfd3112bb (diff)
parentf18fb2382276aee4f6cb338e8d34e120456c6b57 (diff)
downloadcamera-00397ced44ab452c7a35c402d7f699442733653f.tar.gz
Snap for 7749288 from f18fb2382276aee4f6cb338e8d34e120456c6b57 to sc-d2-release
Change-Id: I6c73b2c8e9cd7bf86ae2323c4823cb4d8093f2b8
-rw-r--r--common/hal/utils/result_dispatcher.cc6
1 files 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);
}