summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-03-02 14:37:56 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-03-02 14:37:56 -0800
commit13fdc8a950b435a5355364313dcf033b9b416bd6 (patch)
treefa043011f08f17b6d14f2903f3e945d3f19d3905 /src/com
parent71638be9b1afb5bc73ba1814979efe841def9de2 (diff)
parent2f3653e40381f2cb3ab622759c9528496b7f9a5f (diff)
downloadandroid_packages_apps_Snap-13fdc8a950b435a5355364313dcf033b9b416bd6.tar.gz
android_packages_apps_Snap-13fdc8a950b435a5355364313dcf033b9b416bd6.tar.bz2
android_packages_apps_Snap-13fdc8a950b435a5355364313dcf033b9b416bd6.zip
Merge "Fix Snapshot black in manual pro mode"
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/com/android/camera/CaptureModule.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 9e3bf53d7..fdc4d9c21 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1728,8 +1728,7 @@ public class CaptureModule implements CameraModule, PhotoController,
}
CaptureRequest.Builder captureBuilder =
- mCameraDevice[id].createCaptureRequest(mUI.getCurrentProMode() == ProMode.MANUAL_MODE ?
- CameraDevice.TEMPLATE_MANUAL : CameraDevice.TEMPLATE_STILL_CAPTURE);
+ mCameraDevice[id].createCaptureRequest(CameraDevice.TEMPLATE_STILL_CAPTURE);
if(mSettingsManager.isZSLInHALEnabled()) {
captureBuilder.set(CaptureRequest.CONTROL_ENABLE_ZSL, true);
@@ -1748,7 +1747,6 @@ public class CaptureModule implements CameraModule, PhotoController,
if (mUI.getCurrentProMode() == ProMode.MANUAL_MODE) {
float value = mSettingsManager.getFocusValue(SettingsManager.KEY_FOCUS_DISTANCE);
applyFocusDistance(captureBuilder, String.valueOf(value));
- captureBuilder.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_OFF);
}
if (isDeepZoom()) mSupportZoomCapture = true;