Fix issue of updating Flash in HFR

It doesn't allow to change requests batch in high speed session,
so when update flash mode in HFR, it should still send preview
and video requests together.

Change-Id: Id4092acca15e2bf465f1ebd632f2fa4799567594

1 files changed, 4 insertions, 5 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index d4db0b771..6d85ca3c9 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -5042,17 +5042,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);
             }