Merge "SnapdragonCamera: Add burst preview request nums control" into camera-SnapdragonCamera.lnx.2.0

2 files changed, 6 insertions, 6 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 5bb255768..1d5c4680d 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2447,9 +2447,9 @@ public class CaptureModule implements CameraModule, PhotoController,
 
     private void captureStillPictureForLongshot(CaptureRequest.Builder captureBuilder, int id) throws CameraAccessException{
         List<CaptureRequest> burstList = new ArrayList<>();
-        boolean isBurstShotFpsEnable = PersistUtil.isBurstShotFpsEnabled();
+        int burstShotFpsNums = PersistUtil.isBurstShotFpsNums();
         for (int i = 0; i < PersistUtil.getLongshotShotLimit(); i++) {
-            if (isBurstShotFpsEnable) {
+            for (int j = 0; j < burstShotFpsNums; j++) {
                 mPreviewRequestBuilder[id].setTag("preview");
                 burstList.add(mPreviewRequestBuilder[id].build());
             }
diff --git a/src/com/android/camera/util/PersistUtil.java b/src/com/android/camera/util/PersistUtil.java
index b14394717..647082995 100755
--- a/src/com/android/camera/util/PersistUtil.java
+++ b/src/com/android/camera/util/PersistUtil.java
@@ -125,8 +125,8 @@ public class PersistUtil {
             SystemProperties.get("persist.sys.camera.display.umax", "");
     private static final String PERSIST_DISPLAY_LMAX =
             SystemProperties.get("persist.sys.camera.display.lmax", "");
-    private static final boolean PERSIST_BURST_SHOT_FPS_ENABLED =
-            SystemProperties.getBoolean("persist.sys.camera.burst.shot.fps", false);
+    private static final int PERSIST_BURST_PREVIEW_REQUEST_NUMS =
+            SystemProperties.getInt("persist.sys.camera.burst.preview.nums", 0);
 
     public static int getMemoryLimit() {
         return PERSIST_MEMORY_LIMIT;
@@ -325,7 +325,7 @@ public class PersistUtil {
         return PERSIST_DISPLAY_LMAX;
     }
 
-    public static boolean isBurstShotFpsEnabled() {
-        return PERSIST_BURST_SHOT_FPS_ENABLED;
+    public static int isBurstShotFpsNums() {
+        return PERSIST_BURST_PREVIEW_REQUEST_NUMS;
     }
 }