commit f13bda54c62c0d6c6a35dfc6047c5992b652652f
author Yin-Chia Yeh <yinchiayeh@google.com> Thu May 31 12:12:59 2018 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Thu May 31 12:12:59 2018 -0700
tree cae60ad7032bb4fba95857c79f9b2934802f2d27
parent cc08faac6b309a1acc9a4eb8c28c3fc9669f8771

Camera: send disable error code to API1 client

Test: CTS CameraEvictionTest + IdleUidTest
Bug: 77486868
Change-Id: Ib6f151842fa9cc8f1d580455bff0fd00278a989b

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