Merge "SnapdraongCamera:Fix longshot count in nZSL" into camera-SnapdragonCamera.lnx.2.0

1 files changed, 6 insertions, 9 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 014f72053..61d6cf5fc 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2244,7 +2244,7 @@ public class CaptureModule implements CameraModule, PhotoController,
                     String value = mSettingsManager.getValue(SettingsManager.KEY_JPEG_QUALITY);
                     int quality = getQualityNumber(value);
                     int orientation = CameraUtil.getJpegRotation(id,mOrientation);
-                    int imageCount = mLongshotActive? MAX_IMAGEREADERS*4 : 1;
+                    int imageCount = mLongshotActive? PersistUtil.getLongshotShotLimit(): 1;
                     HeifWriter writer = createHEIFEncoder(path,mPictureSize.getWidth(),mPictureSize.getHeight(),
                             orientation,imageCount,quality);
                     if (writer != null) {
@@ -2414,20 +2414,17 @@ public class CaptureModule implements CameraModule, PhotoController,
                     }
 
                 }
-                if(mLongshotActive) {
-                    captureStillPicture(getMainCameraId());
-                } else {
-                    mLongshoting = false;
-                    mNumFramesArrived.getAndSet(0);
-                    unlockFocus(getMainCameraId());
-                }
+
+                mLongshoting = false;
+                mNumFramesArrived.getAndSet(0);
+                unlockFocus(getMainCameraId());
             }
         };
 
     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*4; i++) {
+        for (int i = 0; i < PersistUtil.getLongshotShotLimit(); i++) {
             if (isBurstShotFpsEnable) {
                 mPreviewRequestBuilder[id].setTag("preview");
                 burstList.add(mPreviewRequestBuilder[id].build());