Merge "Fix issue of updating Flash in HFR" into camera-SnapdragonCamera.lnx.2.0

1 files changed, 4 insertions, 5 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c8e644bd5..d8a5b75b5 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -5047,17 +5047,16 @@ public class CaptureModule implements CameraModule, PhotoController,
         applyVideoFlash(mVideoPausePreviewRequestBuilder);
         CaptureRequest captureRequest = null;
         try {
-            if (mMediaRecorderPausing) {
-                captureRequest = mVideoPausePreviewRequestBuilder.build();
-            } else {
-                captureRequest = mVideoRequestBuilder.build();
-            }
+            captureRequest = mVideoRequestBuilder.build();
             if (mCurrentSession instanceof CameraConstrainedHighSpeedCaptureSession) {
                 CameraConstrainedHighSpeedCaptureSession session =
                         (CameraConstrainedHighSpeedCaptureSession) mCurrentSession;
                 List requestList = session.createHighSpeedRequestList(captureRequest);
                 session.setRepeatingBurst(requestList, mCaptureCallback, mCameraHandler);
             } else {
+                if (mMediaRecorderPausing) {
+                    captureRequest = mVideoPausePreviewRequestBuilder.build();
+                }
                 mCurrentSession.setRepeatingRequest(captureRequest, mCaptureCallback,
                         mCameraHandler);
             }