commit 2a56c7b974fab4eac7371840786801ddb16f7ee7
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 30 18:08:38 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 30 18:08:38 2021 +0000
tree c00b3ab0d0f00dd4747acd7d9e0432aa9390349c
parent 1677878aa67939b4739832d4bfec6f5e936d70b3
parent c8a6f25c4cf66a6e90b5e22f5f2e4c1608bf794d

Merge "camera: Return error code ERROR_CAMERA_IN_USE if setTorchMode return busy"

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)",