diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp
index 57fa9a15..e0e5e688 100644
--- a/app/src/main/cpp/camera2/ndkcamera.cpp
+++ b/app/src/main/cpp/camera2/ndkcamera.cpp
@@ -796,7 +796,7 @@ int NdkCamera::open(const std::string& cameraId) {
 				// uint8_t trig = ACAMERA_CONTROL_AF_TRIGGER_CANCEL;
 				// status = ACaptureRequest_setEntry_u8(request->request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
 
-				// trig = ACAMERA_CONTROL_AF_TRIGGER_START;
+				trig = ACAMERA_CONTROL_AF_TRIGGER_START;
 				// status = ACaptureRequest_setEntry_u8(request->request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
 			}
 		}
@@ -1023,11 +1023,14 @@ NdkCamera::CaptureRequest* NdkCamera::CreateRequest(bool isPreviewRequest)
 			// uint8_t afMode = ACAMERA_CONTROL_AF_MODE_AUTO;
 			status = ACaptureRequest_setEntry_u8(request->request, ACAMERA_CONTROL_AF_MODE, 1, &afMode);
 
-			// uint8_t trig = ACAMERA_CONTROL_AF_TRIGGER_CANCEL;
-			// status = ACaptureRequest_setEntry_u8(request->request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
+			if (isPreviewRequest)
+			{
+				uint8_t trig = ACAMERA_CONTROL_AF_TRIGGER_CANCEL;
+				// status = ACaptureRequest_setEntry_u8(request->request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
 
-			// trig = ACAMERA_CONTROL_AF_TRIGGER_START;
-			// status = ACaptureRequest_setEntry_u8(request->request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
+				trig = ACAMERA_CONTROL_AF_TRIGGER_START;
+				status = ACaptureRequest_setEntry_u8(request->request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
+			}
 		}
 	}
 	else
@@ -1721,8 +1724,8 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
 		status = ACameraMetadata_getConstEntry(result, ACAMERA_CONTROL_AF_STATE, &val);
 		afState = (status == ACAMERA_OK) ? *(val.data.u8) : ACAMERA_CONTROL_AF_STATE_INACTIVE;
 
-		// ALOGW("Preview State AFS=%u AES=%u AWBS=%u Time=%u",
-		//      (unsigned int)afState, (unsigned int)aeState, (unsigned int)awbState, (unsigned int)(ts - m_startTime));
+		XYLOG(XYLOG_SEVERITY_DEBUG, "Preview State AFS=%u AES=%u AWBS=%u Time=%u",
+		      (unsigned int)afState, (unsigned int)aeState, (unsigned int)awbState, (unsigned int)(ts - m_startTime));
 
 		// Check if timeout
 		if (ts - m_startTime < m_params.focusTimeout)