Snapdragon Camera: Use consistent API for preview fps reset

 Instead of using preview fps range API during
 preview framerate reset use the fixed fps API.
 This is to avoid any inconsistent behavior that
 can be triggered when using both APIs from
 MediaRecorder and Snapdragon application side.

Change-Id: Ib5251d8ea4d697db9bdea4e5ebf20606b286f54f

2 files changed, 12 insertions, 5 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 5ce980583..f871c40c5 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -2057,11 +2057,9 @@ public class VideoModule implements CameraModule,
                 startPreview();
             } else {
                 if (is4KEnabled()) {
-                    int[] fpsRange = CameraUtil.getMaxPreviewFpsRange(mParameters);
-                    if (fpsRange.length > 0) {
-                        mParameters.setPreviewFpsRange(
-                            fpsRange[Parameters.PREVIEW_FPS_MIN_INDEX],
-                            fpsRange[Parameters.PREVIEW_FPS_MAX_INDEX]);
+                    int fps = CameraUtil.getMaxPreviewFps(mParameters);
+                    if (fps > 0) {
+                        mParameters.setPreviewFrameRate(fps);
                     } else {
                         mParameters.setPreviewFrameRate(30);
                     }
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index eb237b8a4..c8dfeef70 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -980,6 +980,15 @@ public class CameraUtil {
         return new int[0];
     }
 
+    public static int getMaxPreviewFps(Parameters params) {
+        List<Integer> frameRates = params.getSupportedPreviewFrameRates();
+        if (frameRates != null && frameRates.size() > 0) {
+            // The list is sorted. Return the last element.
+            return frameRates.get(frameRates.size() - 1).intValue();
+        }
+        return -1;
+    }
+
     private static class ImageFileNamer {
         private final SimpleDateFormat mFormat;