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 | 4c9aeb21051e908b0a0a0864a04a96a4109717a1 (patch) | |
| tree | 1f6d6418e6fcf08c4d95abbf38f8e01ea4c390ab /services | |
| parent | b8f0090af19b95027d2e08667c662d058832f94b (diff) | |
| parent | 709bc10c04a9b62875b1c7f1f69486cf275338ba (diff) | |
| download | frameworks_av-4c9aeb21051e908b0a0a0864a04a96a4109717a1.zip frameworks_av-4c9aeb21051e908b0a0a0864a04a96a4109717a1.tar.gz frameworks_av-4c9aeb21051e908b0a0a0864a04a96a4109717a1.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; |