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

Commit 537607f1 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" into sc-qpr1-dev am: d65272ea

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

Change-Id: I968b4210dcebfc4cfbb5bf3ff2356a52915558ba
parents 0e8cf57b d65272ea

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