commit ce953ce4d698155c50356df093712df1dea76051
author Eino-Ville Talvala <etalvala@google.com> Wed Oct 03 15:20:38 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 03 15:20:38 2012 -0700
tree 99f36762140decd00c7fc996e24eddc91016d957
parent c20630569431234db23b6182dd17102023dee68e
parent 260f267288502b73d1920a3701be2038753125b5

Merge "Camera2: Properly update FPS range when FPS is set." into jb-mr1-dev

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 5248e97..74f4a7e 100644
--- a/services/camera/libcameraservice/camera2/Parameters.cpp
+++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1057,6 +1057,10 @@
             validatedParams.previewFpsRange[1] =
                     availableFrameRates.data.i32[i+1];
         }
+        newParams.set(CameraParameters::KEY_PREVIEW_FPS_RANGE,
+                String8::format("%d,%d",
+                        validatedParams.previewFpsRange[0] * kFpsToApiScale,
+                        validatedParams.previewFpsRange[1] * kFpsToApiScale));
     }
 
     // PICTURE_SIZE