From 4242d9bbc4efe9318d396a96302a47e89ce720e9 Mon Sep 17 00:00:00 2001
From: mali <mali81@huawei.com>
Date: Thu, 15 Sep 2022 17:36:04 +0800
Subject: [PATCH] Repairing the problem of camera zoom black screen

Signed-off-by: mali <mali81@huawei.com>
---
 services/camera_service/src/hcamera_device.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/services/camera_service/src/hcamera_device.cpp b/services/camera_service/src/hcamera_device.cpp
index feb5663..64c852f 100644
--- a/services/camera_service/src/hcamera_device.cpp
+++ b/services/camera_service/src/hcamera_device.cpp
@@ -191,11 +191,12 @@ void HCameraDevice::ReportFlashEvent(const std::shared_ptr<OHOS::Camera::CameraM
     int ret = OHOS::Camera::FindCameraMetadataItem(settings->get(), OHOS_CONTROL_FLASH_MODE, &item);
     if (ret == CAM_META_SUCCESS) {
         flashMode = static_cast<camera_flash_mode_enum_t>(item.data.u8[0]);
-        POWERMGR_SYSEVENT_FLASH_ON();
-    } else {
-        MEDIA_ERR_LOG("ReportFlashEvent::GetFlashMode Failed with return code %{public}d", ret);
-        flashMode = OHOS_CAMERA_FLASH_MODE_CLOSE;
+    }
+
+    if (flashMode == OHOS_CAMERA_FLASH_MODE_CLOSE) {
         POWERMGR_SYSEVENT_FLASH_OFF();
+    } else {
+        POWERMGR_SYSEVENT_FLASH_ON();
     }
 }