Snap for 10205954 from a476527aa8942b3bd82c9393eb0a88359400c4ee to udc-d1-release

Change-Id: I4435a2001c0917bbd9fd1e788d5366d549d208d4

2 files changed, 14 insertions, 1 deletions

diff --git a/common/hal/google_camera_hal/realtime_zsl_result_processor.cc b/common/hal/google_camera_hal/realtime_zsl_result_processor.cc
index 0475c46..6580167 100644
--- a/common/hal/google_camera_hal/realtime_zsl_result_processor.cc
+++ b/common/hal/google_camera_hal/realtime_zsl_result_processor.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-//#define LOG_NDEBUG 0
+// #define LOG_NDEBUG 0
 #include "hal_types.h"
 #define LOG_TAG "GCH_RealtimeZslResultProcessor"
 #define ATRACE_TAG ATRACE_TAG_CAMERA
@@ -263,6 +263,12 @@ void RealtimeZslResultProcessor::Notify(
     return;
   }
 
+  // Do not notify errors for internal streams
+  if (message.type == MessageType::kError &&
+      message.message.error.error_stream_id == stream_id_) {
+    return;
+  }
+
   notify_(message);
 }
 
diff --git a/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc b/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc
index 472b5bc..d9a851a 100644
--- a/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc
+++ b/common/hal/google_camera_hal/realtime_zsl_result_request_processor.cc
@@ -351,6 +351,13 @@ void RealtimeZslResultRequestProcessor::Notify(
           message.message.shutter.timestamp_ns,
           message.message.shutter.readout_timestamp_ns);
   }
+
+  // Do not notify errors for internal streams
+  if (message.type == MessageType::kError &&
+      message.message.error.error_stream_id == stream_id_) {
+    return;
+  }
+
   notify_(message);
 }