commit 0d2fa08f27ef47730d62e5ea7ef0f9e668eb1069
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Feb 20 12:31:53 2019 -0800
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Feb 20 12:31:53 2019 -0800
tree 55182a1a079ae64ba975de3f399c25845f1287bc
parent 0302b6d14cca873521fb65b184fe8964b496affc

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

diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp
index e002e18..162b50f 100644
--- a/services/camera/libcameraservice/api1/Camera2Client.cpp
+++ b/services/camera/libcameraservice/api1/Camera2Client.cpp
@@ -1767,14 +1767,13 @@
         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);