commit 5a523197d3c00f695c12729c39e838c1de365465
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Feb 21 04:39:36 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 21 04:39:36 2019 +0000
tree 0d3a1943581c21a9c77fe364f99a03d4baaf1318
parent 0cc7c07a0d66369ec7d3c9827aaf63384891106b
parent 0d2fa08f27ef47730d62e5ea7ef0f9e668eb1069

Merge "Camera: notify captureSequener errors"

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