commit a476c9e2d59048928ce50d273a8b31e723fcc492
author Igor Murashkin <iam@google.com> Mon Oct 08 13:15:44 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 08 13:15:44 2012 -0700
tree 1f2585355ee371fb495e5ff4be8c87765937b6f9
parent 30ae899f684e0ddc31576ed67bf5ef41eaffd01f
parent a290191b7b9846ae5648e74bf8df8f496484cea3

am a761686d: am 4c9aeb21: Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev

* commit 'a761686d14ff8abd704a4802ca6ea0b801a9a32d':
  Camera2: Fix Parameters#setZoom off by 1 validation error

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 389f6e4..4ed17de 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;