commit c8a6f25c4cf66a6e90b5e22f5f2e4c1608bf794d
author Dijack Dong <hailang.dong@hp.com> Fri Sep 17 16:21:16 2021 +0800
committer Dijack Dong <hailang.dong@hp.com> Wed Sep 29 17:32:59 2021 +0800
tree 041a8d4972ab66fffc57dad4c219e1935f7438e2
parent 01fd6fefb19e5855d5556472e5b2aed2fd7621c3

camera: Return error code ERROR_CAMERA_IN_USE if setTorchMode return busy

Test: cts-on-gsi
    run cts-on-gsi -m CtsCameraTestCases -t android.hardware.camera2.cts.FlashlightTest

Bug: 201496581

Change-Id: Ifa361882e041606d20b6212267cfb2188190ed95

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index ae7e05c..721af95 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -1953,6 +1953,11 @@
                     id.string());
                 errorCode = ERROR_ILLEGAL_ARGUMENT;
                 break;
+            case -EBUSY:
+                msg = String8::format("Camera \"%s\" is in use",
+                    id.string());
+                errorCode = ERROR_CAMERA_IN_USE;
+                break;
             default:
                 msg = String8::format(
                     "Setting torch mode of camera \"%s\" to %d failed: %s (%d)",