From d873a22620153af67ac136fd2c92200455ccebe9 Mon Sep 17 00:00:00 2001 From: xuedong Date: Sat, 11 May 2024 17:23:09 +0800 Subject: [PATCH] fix: csec rectification Signed-off-by: xuedong --- brightness_manager/include/brightness_action.h | 2 +- brightness_manager/include/brightness_service.h | 2 +- brightness_manager/include/calculation_manager.h | 4 ++-- brightness_manager/include/light_lux_manager.h | 4 ++-- brightness_manager/src/brightness_dimming.cpp | 5 +++-- brightness_manager/src/brightness_service.cpp | 11 ++++++++--- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/brightness_manager/include/brightness_action.h b/brightness_manager/include/brightness_action.h index 58f4642..42ab05a 100644 --- a/brightness_manager/include/brightness_action.h +++ b/brightness_manager/include/brightness_action.h @@ -29,7 +29,7 @@ namespace OHOS { namespace DisplayPowerMgr { class BrightnessAction { public: - BrightnessAction(uint32_t displayId); + explicit BrightnessAction(uint32_t displayId); ~BrightnessAction() = default; BrightnessAction(const BrightnessAction&) = delete; BrightnessAction& operator=(const BrightnessAction&) = delete; diff --git a/brightness_manager/include/brightness_service.h b/brightness_manager/include/brightness_service.h index f5cae15..3772bac 100644 --- a/brightness_manager/include/brightness_service.h +++ b/brightness_manager/include/brightness_service.h @@ -54,7 +54,7 @@ public: public: DimmingCallbackImpl(const std::shared_ptr& action, std::function callback); - ~DimmingCallbackImpl() = default; + ~DimmingCallbackImpl() override = default; DimmingCallbackImpl(const DimmingCallbackImpl&) = delete; DimmingCallbackImpl& operator=(const DimmingCallbackImpl&) = delete; DimmingCallbackImpl(DimmingCallbackImpl&&) = delete; diff --git a/brightness_manager/include/calculation_manager.h b/brightness_manager/include/calculation_manager.h index e24c55a..8c4b42f 100644 --- a/brightness_manager/include/calculation_manager.h +++ b/brightness_manager/include/calculation_manager.h @@ -65,8 +65,8 @@ private: void ResetDefaultBrightnessOffset(); BrightnessCalculationCurve mBrightnessCalculationCurve{}; - uint32_t mDisplayId; - int mCurrentUserId; + uint32_t mDisplayId{0}; + int mCurrentUserId{0}; bool mIsCameraCurveEnable{false}; bool mIsGameCurveEnable{false}; float mDefaultBrightness{false}; diff --git a/brightness_manager/include/light_lux_manager.h b/brightness_manager/include/light_lux_manager.h index 9e00c03..34546d2 100644 --- a/brightness_manager/include/light_lux_manager.h +++ b/brightness_manager/include/light_lux_manager.h @@ -26,8 +26,8 @@ namespace OHOS { namespace DisplayPowerMgr { class LightLuxManager : public ILightLuxManager { public: - LightLuxManager() = default; - virtual ~LightLuxManager() = default; + LightLuxManager() = default; + ~LightLuxManager() override = default; LightLuxManager(const LightLuxManager&) = delete; LightLuxManager& operator=(const LightLuxManager&) = delete; diff --git a/brightness_manager/src/brightness_dimming.cpp b/brightness_manager/src/brightness_dimming.cpp index a71de6c..b820226 100644 --- a/brightness_manager/src/brightness_dimming.cpp +++ b/brightness_manager/src/brightness_dimming.cpp @@ -88,7 +88,8 @@ void BrightnessDimming::StartDimming(uint32_t from, uint32_t to, uint32_t durati } DISPLAY_HILOGI(FEAT_BRIGHTNESS, "animation orig mTotalSteps=%{public}d", static_cast(mTotalSteps)); if (mTotalSteps > 1 && abs(mStride) >= 1) { - mTotalSteps = (abs(changeBrightness) - abs(mStride) * mTotalSteps) / abs(mStride) + mTotalSteps; + mTotalSteps = static_cast((abs(changeBrightness) - abs(mStride) * + mTotalSteps)) / abs(mStride) + mTotalSteps; DISPLAY_HILOGI(FEAT_BRIGHTNESS, "animation update mTotalSteps=%{public}d", static_cast(mTotalSteps)); } mCurrentStep = 0; @@ -134,7 +135,7 @@ void BrightnessDimming::NextStep() mCallback->OnStart(); } if (mCurrentStep <= mTotalSteps) { - uint32_t nextBrightness = mCurrentBrightness + mStride; + uint32_t nextBrightness = mCurrentBrightness + static_cast(mStride); bool isOutRange = (mStride > 0 ? (nextBrightness >= mToBrightness) : (nextBrightness <= mToBrightness)); if (isOutRange) { DISPLAY_HILOGI(FEAT_BRIGHTNESS, "next step brightness is out range, brightness=%{public}u", diff --git a/brightness_manager/src/brightness_service.cpp b/brightness_manager/src/brightness_service.cpp index 76ec155..3b88df1 100644 --- a/brightness_manager/src/brightness_service.cpp +++ b/brightness_manager/src/brightness_service.cpp @@ -571,8 +571,8 @@ void BrightnessService::SetBrightnessLevel(uint32_t value, uint32_t duration) uint32_t BrightnessService::GetBrightnessLevel(float lux) { - uint32_t brightnessLevel = static_cast(mBrightnessCalculationManager.GetInterpolatedValue(lux) - * MAX_DEFAULT_BRGIHTNESS_LEVEL); + uint32_t brightnessLevel = static_cast(mBrightnessCalculationManager.GetInterpolatedValue(lux) * + MAX_DEFAULT_BRGIHTNESS_LEVEL); DISPLAY_HILOGI(FEAT_BRIGHTNESS, "GetBrightnessLevel lux=%{public}f, brightnessLevel=%{public}d", lux, brightnessLevel); return brightnessLevel; @@ -822,8 +822,13 @@ bool BrightnessService::UpdateBrightness(uint32_t value, uint32_t gradualDuratio uint32_t BrightnessService::GetSettingBrightness(const std::string& key) { - uint32_t settingBrightness; + uint32_t settingBrightness = DEFAULT_BRIGHTNESS; auto isSuccess = BrightnessSettingHelper::GetSettingBrightness(settingBrightness, key); + if (isSuccess != ERR_OK) { + DISPLAY_HILOGW(FEAT_BRIGHTNESS, + "get setting brightness failed, return default=%{public}d, key=%{public}s, ret=%{public}d", + settingBrightness, key.c_str(), isSuccess); + } DISPLAY_HILOGI(FEAT_BRIGHTNESS, "GetSettingBrightness=%{public}d", settingBrightness); return settingBrightness; } -- Gitee