summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CaptureModule.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-10-03 10:10:33 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-03 10:10:33 -0700
commita8e7262d5b359dc1054eb211d107eb551ab696a2 (patch)
tree2b25a52518fa1b599da6093d975c9a319ff65c98 /src/com/android/camera/CaptureModule.java
parent0d4ac4ee04322171f0f3f4986e072980284f18fd (diff)
parentff46acbd04a495eb93f45417421156ec6dfdc17f (diff)
downloadandroid_packages_apps_Snap-a8e7262d5b359dc1054eb211d107eb551ab696a2.tar.gz
android_packages_apps_Snap-a8e7262d5b359dc1054eb211d107eb551ab696a2.tar.bz2
android_packages_apps_Snap-a8e7262d5b359dc1054eb211d107eb551ab696a2.zip
Merge "SnapdragonCamera: Add exposure lock flag to capture request." into camera.lnx.1.0.c7-dev
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
-rw-r--r--src/com/android/camera/CaptureModule.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c914b8602..00fb6f161 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1132,6 +1132,7 @@ public class CaptureModule implements CameraModule, PhotoController,
addPreviewSurface(captureBuilder, null, id);
captureBuilder.set(CaptureRequest.CONTROL_AF_MODE, mControlAFMode);
captureBuilder.set(CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.CONTROL_AF_TRIGGER_IDLE);
+ applySettingsForLockExposure(captureBuilder, id);
applySettingsForCapture(captureBuilder, id);
if(csEnabled) {