commit f3c7f03eaefc2a89ce28b5ee1abf4056643546e8
author Eino-Ville Talvala <etalvala@google.com> Wed Oct 03 15:25:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 03 15:25:45 2012 -0700
tree 407c73da7372199c6bf4c7c1be0dac064348a8c6
parent acd69364cac252c9ec0c4aaa48ad8e8f01d11662
parent d83c791239fba8780d4593528f50d21cb50eba7e

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

* commit 'a9438d09fb44f6c95a558accd05711600cc4b2bf':
  Camera2: Properly update FPS range when FPS is set.

services/camera/libcameraservice/camera2/Parameters.cpp

diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp
index 7685664..3775558 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