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

6 years ago · 4fe8f25fa2
parent 0dabe8d05f f13bda54c6
commit 4fe8f25fa2
1 changed files with 5 additions and 2 deletions
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@ -2337,10 +2337,13 @@ void CameraService::BasicClient::block() {

 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!!");
    }