summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@quicinc.com>2020-01-01 00:29:17 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2020-01-01 00:29:17 -0800
commit0a0673b1d588f4ed74d391037f6505f724282b05 (patch)
treeb0728288c1266a7085277d7275e779155c6b07a9
parent36d01a6c5865c06e49cb0e6da985d7c340afd4b0 (diff)
parent4a47aa1b2e601913a4ec97838ec64c445fec4872 (diff)
downloadandroid_packages_apps_Snap-0a0673b1d588f4ed74d391037f6505f724282b05.zip
android_packages_apps_Snap-0a0673b1d588f4ed74d391037f6505f724282b05.tar.gz
android_packages_apps_Snap-0a0673b1d588f4ed74d391037f6505f724282b05.tar.bz2
Merge "Fix issue of updating Flash in HFR" into camera-SnapdragonCamera.lnx.2.0
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c8e644b..d8a5b75 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);
}