Merge "Camera: parse preview fps and fps range correctly" am: 4d9abd9392

am: 35be00e8e6 Change-Id: I840520af5fb08bea112ce0927ddfdde6df322bf3
7 years ago · 6d0b7083dd
parent 2fd1f62aa8 35be00e8e6
commit 6d0b7083dd
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.