diff options
| author | Igor Murashkin <iam@google.com> | 2012-10-08 13:10:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-08 13:10:49 -0700 |
| commit | 07cc78fe7dee9a96cd33865de890d0890fe752d7 (patch) | |
| tree | 46509c08c174610e98893ffa5a35e71b3fdf9354 /services | |
| parent | 8ada0bf772354a1d31361d3b4f49efd36d8a6e6e (diff) | |
| parent | cfdd84284394cecdb33cf121fe6d4205da84c761 (diff) | |
| download | frameworks_av-07cc78fe7dee9a96cd33865de890d0890fe752d7.zip frameworks_av-07cc78fe7dee9a96cd33865de890d0890fe752d7.tar.gz frameworks_av-07cc78fe7dee9a96cd33865de890d0890fe752d7.tar.bz2 | |
Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
Diffstat (limited to 'services')
| -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; |