commit bcc63b1434f2d8d2dee9e921151bf27485669ab6
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Mar 03 03:55:37 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Mar 03 03:55:37 2018 +0000
tree 6891834b69b4211c4d1b387b561feba43e6ea3d7
parent 936aced80442062afe07ac58ac14bc6141ad00c0
parent c067179b6a402fc0c284cfae886058a6738e9b20

Merge "Camera: fix supported FPS string"

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 b4c7e9d..8d8bcab 100644
--- a/services/camera/libcameraservice/api1/client2/Parameters.cpp
+++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp
@@ -242,7 +242,9 @@
                 HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED, availableFpsRanges.data.i32[i+1])) {
                 continue;
             }
-            if (i != 0) supportedPreviewFpsRange += ",";
+            if (supportedPreviewFpsRange.length() > 0) {
+                supportedPreviewFpsRange += ",";
+            }
             supportedPreviewFpsRange += String8::format("(%d,%d)",
                     availableFpsRanges.data.i32[i] * kFpsToApiScale,
                     availableFpsRanges.data.i32[i+1] * kFpsToApiScale);