Merge "SnapdragonCamera: Set burst shotFps controlled by setprop" into camera-SnapdragonCamera.lnx.2.0

1 files changed, 5 insertions, 6 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 0c4106675..b2ebc34be 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2409,8 +2409,11 @@ 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();
         for (int i = 0; i < MAX_IMAGEREADERS*2; i++) {
-            burstList.add(mPreviewRequestBuilder[id].build());
+            if (isBurstShotFpsEnable) {
+                burstList.add(mPreviewRequestBuilder[id].build());
+            }
             burstList.add(captureBuilder.build());
         }
         mCaptureSession[id].captureBurst(burstList, mLongshotCallBack, mCaptureCallbackHandler);
@@ -4239,7 +4242,7 @@ public class CaptureModule implements CameraModule, PhotoController,
             mVideoSnapshotSize = getMaxPictureSizeLiveshot();
         }
 
-        String videoSnapshot = getVideoSnapshotSize();
+        String videoSnapshot = PersistUtil.getVideoSnapshotSize();
         String[] sourceStrArray = videoSnapshot.split("x");
         if (sourceStrArray != null && sourceStrArray.length >= 2) {
             int width = Integer.parseInt(sourceStrArray[0]);
@@ -4281,10 +4284,6 @@ public class CaptureModule implements CameraModule, PhotoController,
         return optimalSize;
     }
 
-    private String getVideoSnapshotSize(){
-        return SystemProperties.get("persist.sys.camera.video.snapshotsize", "");
-    }
-
     private boolean isVideoSize1080P(Size size) {
         return (size.getHeight() == 1080 && size.getWidth() == 1920);
     }