summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-12-12 04:35:19 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-12-12 04:35:19 -0800
commit921f39287e4a5f9d602ae229e0b77cde3a847538 (patch)
treed6d021d7a37d5fd965592e756fe3ceb6afefe254 /src
parentf37735325307310745d01d5a4eca05270839238c (diff)
parent09d72e1499d92afe135f5c0a6e03836c14268b1e (diff)
downloadandroid_packages_apps_Snap-921f39287e4a5f9d602ae229e0b77cde3a847538.tar.gz
android_packages_apps_Snap-921f39287e4a5f9d602ae229e0b77cde3a847538.tar.bz2
android_packages_apps_Snap-921f39287e4a5f9d602ae229e0b77cde3a847538.zip
Merge "SnapdragonCamera: Fix FD not correctly when flash on"
Diffstat (limited to 'src')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 129497d7e..d9e8473c1 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3421,7 +3421,8 @@ public class CaptureModule implements CameraModule, PhotoController,
if (!mIsRecordingVideo || mHighSpeedCapture) return;
applyVideoFlash(mVideoRequestBuilder);
try {
- mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), null, mCameraHandler);
+ mCurrentSession.setRepeatingRequest(mVideoRequestBuilder.build(), mCaptureCallback,
+ mCameraHandler);
} catch (CameraAccessException e) {
e.printStackTrace();
}