From a0cf5e39f59fac2da107e3fb1fe2037cce22baaf Mon Sep 17 00:00:00 2001
From: wangchaole <wangchaole1@huawei.com>
Date: Thu, 11 Aug 2022 15:43:34 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AHandling=20reviewbot=20alerts?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangchaole <wangchaole1@huawei.com>
---
 .../client/include/dcamera_client.h             |  1 +
 .../client/src/dcamera_client.cpp               | 17 +++++++++++------
 .../client/src/dcamera_client_common.cpp        |  6 ++++++
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/services/cameraservice/cameraoperator/client/include/dcamera_client.h b/services/cameraservice/cameraoperator/client/include/dcamera_client.h
index 1bf9d23b..d0b1df0d 100644
--- a/services/cameraservice/cameraoperator/client/include/dcamera_client.h
+++ b/services/cameraservice/cameraoperator/client/include/dcamera_client.h
@@ -66,6 +66,7 @@ private:
         std::shared_ptr<CameraStandard::PhotoCaptureSetting>& photoCaptureSetting);
     void ReleaseCaptureSession();
     int32_t CameraServiceErrorType(const int32_t errorType);
+    void UpdateSettingCache(const std::string& metadataStr);
 
 private:
     constexpr static uint32_t DCAMERA_MAX_METADATA_SIZE = 20;
diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
index 985abdf6..d44c313b 100644
--- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
+++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp
@@ -102,12 +102,7 @@ int32_t DCameraClient::UpdateSettings(std::vector<std::shared_ptr<DCameraSetting
 
                 if (cameraInput_ == nullptr) {
                     DHLOGE("DCameraClient::UpdateSettings %s cameraInput is null", GetAnonyString(cameraId_).c_str());
-                    if (cameraMetadatas_.size() == DCAMERA_MAX_METADATA_SIZE) {
-                        DHLOGE("DCameraClient::UpdateSettings %s camera metadata oversize",
-                            GetAnonyString(cameraId_).c_str());
-                        cameraMetadatas_.pop();
-                    }
-                    cameraMetadatas_.push(metadataStr);
+                    UpdateSettingCache(metadataStr);
                     return DCAMERA_OK;
                 }
 
@@ -129,6 +124,16 @@ int32_t DCameraClient::UpdateSettings(std::vector<std::shared_ptr<DCameraSetting
     return DCAMERA_OK;
 }
 
+void DCameraClient::UpdateSettingCache(const std::string& metadataStr)
+{
+    if (cameraMetadatas_.size() == DCAMERA_MAX_METADATA_SIZE) {
+        DHLOGE("DCameraClient::UpdateSettings %s camera metadata oversize",
+            GetAnonyString(cameraId_).c_str());
+        cameraMetadatas_.pop();
+    }
+    cameraMetadatas_.push(metadataStr);
+}
+
 void DCameraClient::FindCameraMetadata(const std::string& metadataStr)
 {
     std::shared_ptr<Camera::CameraMetadata> cameraMetadata = Camera::MetadataUtils::DecodeFromString(metadataStr);
diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp
index f1c0bc19..c2f351d8 100644
--- a/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp
+++ b/services/cameraservice/cameraoperator/client/src/dcamera_client_common.cpp
@@ -103,6 +103,7 @@ int32_t DCameraClient::UpdateSettings(std::vector<std::shared_ptr<DCameraSetting
                 if (cameraInput_ == nullptr) {
                     DHLOGE("DCameraClientCommon::UpdateSettings %s cameraInput is null",
                         GetAnonyString(cameraId_).c_str());
+                    UpdateSettingCache(metadataStr);
                     return DCAMERA_BAD_VALUE;
                 }
 
@@ -124,6 +125,11 @@ int32_t DCameraClient::UpdateSettings(std::vector<std::shared_ptr<DCameraSetting
     return DCAMERA_OK;
 }
 
+void DCameraClient::UpdateSettingCache(const std::string& metadataStr)
+{
+    DHLOGE("DCameraClientCommon::UpdateSettingCache metadataStr %s", GetAnonyString(metadataStr).c_str());
+}
+
 void DCameraClient::FindCameraMetadata(const std::string& metadataStr)
 {
     DHLOGI("DCameraClient::FindCameraMetadata cameraId: %s", GetAnonyString(cameraId_).c_str());
-- 
Gitee