From 2f3653e40381f2cb3ab622759c9528496b7f9a5f Mon Sep 17 00:00:00 2001
From: zhuw <zhuw@codeaurora.org>
Date: Tue, 27 Feb 2018 18:03:58 +0800
Subject: Fix Snapshot black in manual pro mode

remove the setting of control_mode
captureBuilder back to TEMPLATE_STILL_CAPTURE

Change-Id: Ie51a2dda7c8e13336a93e3612b827bbb5e984092
---
 src/com/android/camera/CaptureModule.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/com')

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;
-- 
cgit v1.2.3