commit 4fe8f25fa2e988e318786d218d209298b4e088cb
author TreeHugger Robot <treehugger-gerrit@google.com> Thu May 31 21:11:24 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 31 21:11:24 2018 +0000
tree a64507ce2d00f4826e5cf22fc13b6a4dfd5db5f9
parent 0dabe8d05ffda216042696e19f000cc89bf81593
parent f13bda54c62c0d6c6a35dfc6047c5992b652652f

Merge "Camera: send disable error code to API1 client" into pi-dev

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index c87b5eb..282871b 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2337,10 +2337,13 @@
 
 void CameraService::Client::notifyError(int32_t errorCode,
         const CaptureResultExtras& resultExtras) {
-    (void) errorCode;
     (void) resultExtras;
     if (mRemoteCallback != NULL) {
-        mRemoteCallback->notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_RELEASED, 0);
+        int32_t api1ErrorCode = CAMERA_ERROR_RELEASED;
+        if (errorCode == hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_DISABLED) {
+            api1ErrorCode = CAMERA_ERROR_DISABLED;
+        }
+        mRemoteCallback->notifyCallback(CAMERA_MSG_ERROR, api1ErrorCode, 0);
     } else {
         ALOGE("mRemoteCallback is NULL!!");
     }