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

Commit d65272ea authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "camera: Return error code ERROR_CAMERA_IN_USE if setTorchMode return busy" into sc-qpr1-dev

parents 0448f677 6c25091d

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