Merge "Fix fail to set vendor tag during HFR" into camera-SnapdragonCamera.lnx.2.0

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 2acccf50d..463c6e5b7 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3965,15 +3965,16 @@ public class CaptureModule implements CameraModule, PhotoController,
             // Create slow motion request list
             List<CaptureRequest> slowMoRequests = null;
             try {
+                setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId);
                 if (mHighSpeedCapture && ((int) mHighSpeedFPSRange.getUpper() > NORMAL_SESSION_MAX_FPS)) {
                     slowMoRequests = ((CameraConstrainedHighSpeedCaptureSession) mCurrentSession).
                             createHighSpeedRequestList(mVideoRequestBuilder.build());
+                    mCurrentSession.setRepeatingBurst(slowMoRequests,
+                            mCaptureCallback, mCameraHandler);
                 } else {
-                    slowMoRequests = new ArrayList<CaptureRequest>();
-                    slowMoRequests.add(mVideoRequestBuilder.build());// Preview + recording.
+                    mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(),
+                            mCaptureCallback, mCameraHandler);
                 }
-                setUpVideoCaptureRequestBuilder(mVideoRequestBuilder, cameraId);
-                mCurrentSession.setRepeatingBurst(slowMoRequests, mCaptureCallback, mCameraHandler);
             } catch (CameraAccessException e) {
                 e.printStackTrace();
             } catch (IllegalStateException e) {