commit 922fa9c08d5604766d4fa2f28022604ccf32316d
author Rucha Katakwar <ruchamk@google.com> Fri Feb 25 17:46:49 2022 -0800
committer Rucha Katakwar <ruchamk@google.com> Tue Mar 01 23:09:09 2022 -0800
tree 1ee467540ab150ea542fde04fe8b48cd21eef5d2
parent 3c5f8aaab6f6d24c99e97ff50da6126599134e09

Camera:Add a check for -EINVAL error code.

Add a case for -EINVAL error code so that Illegal Argument errorcode
is returned if torch strength level is not in valid range.

Bug: 221129617

Test: FlashlightTest passes on Pixel 6 device.
Change-Id: I2cac116106eb415bd7b5b4bdad5a34903852064b

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 0ba1b28..c576162 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -2139,10 +2139,14 @@
                     id.string());
                 errorCode = ERROR_CAMERA_IN_USE;
                 break;
+            case -EINVAL:
+                msg = String8::format("Torch strength level %d is not within the "
+                        "valid range.", torchStrength);
+                errorCode = ERROR_ILLEGAL_ARGUMENT;
+                break;
             default:
                 msg = String8::format("Changing torch strength level failed.");
                 errorCode = ERROR_INVALID_OPERATION;
-
         }
         ALOGE("%s: %s", __FUNCTION__, msg.string());
         return STATUS_ERROR(errorCode, msg.string());