commit 4d9abd9392ab0697548bd9c4c7a25617886a8980
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 07 06:59:48 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 07 06:59:48 2018 +0000
tree 5a00a92a1e7d0014321f4c411eccc09ab1ebe72d
parent e0b256a5a24ba1e2f3a324f86ce2a2bbadca301b
parent b915da10831802013d670d6a316727e7b2e1a74e

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

services/camera/libcameraservice/api1/client2/Parameters.cpp

diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp
index 02a7616..050c3f7 100644
--- a/services/camera/libcameraservice/api1/client2/Parameters.cpp
+++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp
@@ -1324,8 +1324,8 @@
     {
         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.