commit 709bc10c04a9b62875b1c7f1f69486cf275338ba
author Igor Murashkin <iam@google.com> Mon Oct 08 11:16:03 2012 -0700
committer Igor Murashkin <iam@google.com> Mon Oct 08 11:22:37 2012 -0700
tree edf64a12a0500de4e2e644ba880da29289921f75
parent e18c1cce29dde2054ce52b9135b152901883ca91

Camera2: Fix Parameters#setZoom off by 1 validation error

Bug: 7298683
Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 809768c..4d51120 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1514,7 +1514,8 @@
 
     // ZOOM
     validatedParams.zoom = newParams.getInt(CameraParameters::KEY_ZOOM);
-    if (validatedParams.zoom < 0 || validatedParams.zoom > (int)NUM_ZOOM_STEPS) {
+    if (validatedParams.zoom < 0
+                || validatedParams.zoom >= (int)NUM_ZOOM_STEPS) {
         ALOGE("%s: Requested zoom level %d is not supported",
                 __FUNCTION__, validatedParams.zoom);
         return BAD_VALUE;