Merge "Camera: parse preview fps and fps range correctly"

am: 4d9abd9392 Change-Id: I3379a28c5d2028a1d08abffcdd81786d952cf75c
7 years ago · 35be00e8e6
parent 76121a012a 4d9abd9392
commit 35be00e8e6
1 changed files with 2 additions and 2 deletions
--- a/services/camera/libcameraservice/api1/client2/Parameters.cpp
+++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp
@ -1324,8 +1324,8 @@ status_t Parameters::set(const String8& paramString) {
    {
        const char *fpsRange, *fpsSingle;

-        fpsRange = newParams.get(CameraParameters::KEY_PREVIEW_FRAME_RATE);
-        fpsSingle = newParams.get(CameraParameters::KEY_PREVIEW_FPS_RANGE);
+        fpsSingle = newParams.get(CameraParameters::KEY_PREVIEW_FRAME_RATE);
+        fpsRange = newParams.get(CameraParameters::KEY_PREVIEW_FPS_RANGE);

        /**
         * Pick either the range or the single key if only one was set.