diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp
index c0d74e1d..affa35d1 100644
--- a/app/src/main/cpp/camera2/ndkcamera.cpp
+++ b/app/src/main/cpp/camera2/ndkcamera.cpp
@@ -699,7 +699,7 @@ int NdkCamera::open(const std::string& cameraId) {
                 }
             }
 
-            if (aeLockAvailable)
+            if (aeLockAvailable && (m_params.wait3ALocked & WAIT_AE_LOCKED))
             {
                 uint8_t aeLock = ACAMERA_CONTROL_AE_LOCK_ON;
                 status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AE_LOCK, 1,&aeLock);
@@ -751,7 +751,7 @@ int NdkCamera::open(const std::string& cameraId) {
         {
             status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AWB_MODE, 1, &awbMode);
 
-            if ((awbMode == ACAMERA_CONTROL_AWB_MODE_AUTO) && awbLockAvailable)
+            if ((awbMode == ACAMERA_CONTROL_AWB_MODE_AUTO) && awbLockAvailable && (m_params.wait3ALocked & WAIT_AWB_LOCKED))
             {
                 uint8_t awbLock = ACAMERA_CONTROL_AWB_LOCK_ON;
                 status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AWB_LOCK, 1, &awbLock);
@@ -1279,7 +1279,9 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
     }
 
     unsigned long long ts = GetMicroTimeStamp();
+#if 0
     XYLOG(XYLOG_SEVERITY_DEBUG, "3ASTATE: AES=%u AWBS=%u AFS=%u", (uint32_t)mResult.aeState, (uint32_t)mResult.awbState, (uint32_t)mResult.afState);
+#endif
 
     if (m_params.autoExposure != 0)
     {
@@ -1330,8 +1332,6 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
         mResult.sensitivity = (status == ACAMERA_OK) ? (*(val.data.i32)) : 0;
     }
 
-
-
     if (m_imagesCaptured == ~0)
     {
         if (ts - m_startTime >= m_params.focusTimeout * 2)
@@ -1352,7 +1352,9 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
                     }
                     else
                     {
+#if 0
                         XYLOG(XYLOG_SEVERITY_DEBUG, "AWB Locked");
+#endif
                     }
                 }
                 else
@@ -1363,7 +1365,9 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
                     }
                     else
                     {
+#if 0
                         XYLOG(XYLOG_SEVERITY_DEBUG, "AWB CONVERGED Or Locked");
+#endif
                     }
                 }
             }
@@ -1378,7 +1382,9 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
                     }
                     else
                     {
+#if 0
                         XYLOG(XYLOG_SEVERITY_DEBUG, "AE Locked");
+#endif
                     }
                 }
                 else
@@ -1389,7 +1395,9 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
                     }
                     else
                     {
+#if 0
                         XYLOG(XYLOG_SEVERITY_DEBUG, "AE CONVERGED Or Locked");
+#endif
                     }
                 }
             }
@@ -1473,7 +1481,9 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
     mResult.afState = *(val.data.u8);
     */
 
+#if 0
     ALOGD("onCaptureCompleted 2 AFS=%u AES=%u", (unsigned int)mResult.afState, (unsigned int)mResult.aeState);
+#endif
 
     val = {0};
     status = ACameraMetadata_getConstEntry(result, ACAMERA_SENSOR_SENSITIVITY, &val);
@@ -1491,8 +1501,9 @@ void NdkCamera::onCaptureCompleted(ACameraCaptureSession* session, ACaptureReque
     status = ACameraMetadata_getConstEntry(result, ACAMERA_CONTROL_AE_EXPOSURE_COMPENSATION, &val);
     mResult.compensation = (status == ACAMERA_OK) ? *(val.data.i32) : 0;
 
+#if 0
     ALOGD("onCaptureCompleted EXPO=%lld, FD=%f camera id=%s, AE=%s AFS=%u AES=%u", exTime, focusDistance, mCameraId.c_str(), ((aeMode == 1) ? "ON" : "OFF"), mResult.afState, mResult.aeState);
-
+#endif
     // __android_log_print(ANDROID_LOG_WARN, "NdkCamera", "onCaptureCompleted %p %p %p", session, request, result);
 }