Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb19e8de authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "camera: Return error code ERROR_CAMERA_IN_USE if setTorchMode return busy" am: 2a56c7b9 am: 6eabeb22 am: f7a123b6 am: 416bf41b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1829056

Change-Id: I5f1886bb005817dbebec87b4a9e8b6f4b9ca1c41
parents cbda3f1c 416bf41b

services/camera/libcameraservice/CameraService.cpp

+5 −0
Original line number Diff line number Diff line
@@ -2054,6 +2054,11 @@ Status CameraService::setTorchMode(const String16& cameraId, bool enabled, 
                    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)",