Merge "SnapdragonCamera: Remove the previewBuilder callback" into camera-SnapdragonCamera.lnx.2.0

1 files changed, 10 insertions, 0 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 9851f7c40..3f689115c 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2335,6 +2335,10 @@ public class CaptureModule implements CameraModule, PhotoController,
             public void onCaptureCompleted(CameraCaptureSession session,
                                            CaptureRequest request,
                                            TotalCaptureResult result) {
+                String requestTag = String.valueOf(request.getTag());
+                if (requestTag.equals("preview")) {
+                    return;
+                }
                 Log.d(TAG, "captureStillPictureForLongshot onCaptureCompleted: " + mNumFramesArrived.get() + " " + mShotNum);
                 if (mLongshotActive) {
                     checkAndPlayShutterSound(getMainCameraId());
@@ -2350,6 +2354,10 @@ public class CaptureModule implements CameraModule, PhotoController,
             @Override
             public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
                     long timestamp, long frameNumber) {
+                String requestTag = String.valueOf(request.getTag());
+                if (requestTag.equals("preview")) {
+                    return;
+                }
                 mLongshoting = true;
                 mNumFramesArrived.incrementAndGet();
                 if(mNumFramesArrived.get() == mShotNum) {
@@ -2412,8 +2420,10 @@ public class CaptureModule implements CameraModule, PhotoController,
         boolean isBurstShotFpsEnable = PersistUtil.isBurstShotFpsEnabled();
         for (int i = 0; i < MAX_IMAGEREADERS*2; i++) {
             if (isBurstShotFpsEnable) {
+                mPreviewRequestBuilder[id].setTag("preview");
                 burstList.add(mPreviewRequestBuilder[id].build());
             }
+            captureBuilder.setTag("capture");
             burstList.add(captureBuilder.build());
         }
         mCaptureSession[id].captureBurst(burstList, mLongshotCallBack, mCaptureCallbackHandler);