From 0d2fa08f27ef47730d62e5ea7ef0f9e668eb1069 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Wed, 20 Feb 2019 12:31:53 -0800
Subject: [PATCH] Camera: notify captureSequener errors

Test: locally modified camera HAL (faking buffer errors) passing
      CameraTest.java
Bug: 120986771

Change-Id: I436ac5d033f68b59eaa7b129370faf0c0ca6a5f3
---
 services/camera/libcameraservice/api1/Camera2Client.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index e002e186fb..162b50f5ce 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -1767,14 +1767,13 @@ void Camera2Client::notifyError(int32_t errorCode,
         case hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_BUFFER:
             ALOGW("%s: Received recoverable error %d from HAL - ignoring, requestId %" PRId32,
                     __FUNCTION__, errorCode, resultExtras.requestId);
+            mCaptureSequencer->notifyError(errorCode, resultExtras);
             return;
         default:
             err = CAMERA_ERROR_UNKNOWN;
             break;
     }
 
-    mCaptureSequencer->notifyError(errorCode, resultExtras);
-
     ALOGE("%s: Error condition %d reported by HAL, requestId %" PRId32, __FUNCTION__, errorCode,
               resultExtras.requestId);