From 0e756f2cd0d64c9142aede066965caebac07264e Mon Sep 17 00:00:00 2001
From: zhoulongcheng <zhoulongcheng@huawei.com>
Date: Mon, 14 Jul 2025 14:27:58 +0800
Subject: [PATCH 1/2] test_zhou

Signed-off-by: zhoulongcheng <zhoulongcheng@huawei.com>
---
 services/camera_service/src/hstream_capture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/camera_service/src/hstream_capture.cpp b/services/camera_service/src/hstream_capture.cpp
index 7819ce315..4a001c614 100644
--- a/services/camera_service/src/hstream_capture.cpp
+++ b/services/camera_service/src/hstream_capture.cpp
@@ -724,7 +724,7 @@ int32_t HStreamCapture::Capture(const std::shared_ptr<OHOS::Camera::CameraMetada
     camera_position_enum_t cameraPosition = OHOS_CAMERA_POSITION_FRONT;
     {
         std::lock_guard<std::mutex> lock(cameraAbilityLock_);
-        CHECK_RETURN_RET_ELOG(cameraAbility_ == nullptr, CAMERA_INVALID_STATE,
+        CHECK_RETURN_RET_ELOG(!cameraAbility_, CAMERA_INVALID_STATE,
             "HStreamCapture::cameraAbility_ is null");
         int32_t result = OHOS::Camera::FindCameraMetadataItem(cameraAbility_->get(), OHOS_ABILITY_CAMERA_POSITION,
                                                               &item);
-- 
Gitee


From beb9be12fb9f96d09a83d90f01d7215be75a6156 Mon Sep 17 00:00:00 2001
From: zhoulongcheng <zhoulongcheng@huawei.com>
Date: Mon, 14 Jul 2025 14:42:39 +0800
Subject: [PATCH 2/2] test_zhou2

Signed-off-by: zhoulongcheng <zhoulongcheng@huawei.com>
---
 services/camera_service/src/hstream_capture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/camera_service/src/hstream_capture.cpp b/services/camera_service/src/hstream_capture.cpp
index 4a001c614..e4e561a58 100644
--- a/services/camera_service/src/hstream_capture.cpp
+++ b/services/camera_service/src/hstream_capture.cpp
@@ -693,7 +693,7 @@ int32_t HStreamCapture::Capture(const std::shared_ptr<OHOS::Camera::CameraMetada
     // report capture performance dfx
     std::shared_ptr<OHOS::Camera::CameraMetadata> captureMetadataSetting_ = nullptr;
     OHOS::Camera::MetadataUtils::ConvertVecToMetadata(captureInfoPhoto.captureSetting_, captureMetadataSetting_);
-    if (captureMetadataSetting_ == nullptr) {
+    if (!captureMetadataSetting_) {
         captureMetadataSetting_ = std::make_shared<OHOS::Camera::CameraMetadata>(0, 0);
     }
     DfxCaptureInfo captureInfo;
-- 
Gitee