diff options
author | Igor Murashkin <iam@google.com> | 2012-10-08 11:16:03 -0700 |
---|---|---|
committer | Igor Murashkin <iam@google.com> | 2012-10-08 11:22:37 -0700 |
commit | cfdd84284394cecdb33cf121fe6d4205da84c761 (patch) | |
tree | 38eae54ffb921348fd9ee68cadef1fd1ccf52165 | |
parent | 193c13fa1615ad5130b6d75dc05e50468e1c585c (diff) | |
download | frameworks_av-cfdd84284394cecdb33cf121fe6d4205da84c761.zip frameworks_av-cfdd84284394cecdb33cf121fe6d4205da84c761.tar.gz frameworks_av-cfdd84284394cecdb33cf121fe6d4205da84c761.tar.bz2 |
Camera2: Fix Parameters#setZoom off by 1 validation error
Bug: 7298683
Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d
-rw-r--r-- | services/camera/libcameraservice/camera2/Parameters.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ status_t Parameters::set(const String8& paramString) { // 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; |