From e75b0cc8853097e5b693a312371115b4e69bdd5b Mon Sep 17 00:00:00 2001 From: hxf233333 Date: Mon, 2 Sep 2024 21:46:54 +0800 Subject: [PATCH] fix: revert use libdmlite Signed-off-by: hxf233333 --- brightness_manager/BUILD.gn | 12 ++-- .../include/brightness_service.h | 12 ---- brightness_manager/src/brightness_action.cpp | 19 +----- brightness_manager/src/brightness_service.cpp | 67 +------------------ brightness_manager/test/unittest/BUILD.gn | 10 +-- state_manager/frameworks/napi/BUILD.gn | 1 + state_manager/service/BUILD.gn | 12 ++-- .../service/native/include/screen_action.h | 4 -- .../service/native/src/screen_action.cpp | 41 +----------- .../fuzztest/adjustbrightness_fuzzer/BUILD.gn | 10 +-- .../autoadjustbrightness_fuzzer/BUILD.gn | 10 +-- .../fuzztest/boostbrightness_fuzzer/BUILD.gn | 10 +-- .../discountbrightness_fuzzer/BUILD.gn | 10 +-- .../fuzztest/displaystate_fuzzer/BUILD.gn | 10 +-- .../fuzztest/getbrightness_fuzzer/BUILD.gn | 10 +-- .../fuzztest/getdisplayid_fuzzer/BUILD.gn | 10 +-- .../overridebrightness_fuzzer/BUILD.gn | 10 +-- .../overridedisplayoffdelay_fuzzer/BUILD.gn | 10 +-- .../fuzztest/registercallback_fuzzer/BUILD.gn | 10 +-- .../fuzztest/setbrightness_fuzzer/BUILD.gn | 10 +-- .../fuzztest/setcoordinated_fuzzer/BUILD.gn | 10 +-- .../BUILD.gn | 10 +-- .../fuzztest/setmaxbrightness_fuzzer/BUILD.gn | 10 +-- state_manager/test/unittest/BUILD.gn | 2 + 24 files changed, 47 insertions(+), 273 deletions(-) diff --git a/brightness_manager/BUILD.gn b/brightness_manager/BUILD.gn index 9f071eb..78070b2 100644 --- a/brightness_manager/BUILD.gn +++ b/brightness_manager/BUILD.gn @@ -52,9 +52,12 @@ ohos_static_library("brightness_manager") { ] external_deps = [ + "ability_base:zuri", + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "ffrt:libffrt", + "graphic_2d:librender_service_base", "hicollie:libhicollie", "hilog:libhilog", "hisysevent:libhisysevent", @@ -66,6 +69,8 @@ ohos_static_library("brightness_manager") { "power_manager:power_sysparam", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "skia:skia_canvaskit", + "window_manager:libdm", ] defines = [] @@ -73,13 +78,6 @@ ohos_static_library("brightness_manager") { defines += [ "FUZZ_TEST" ] } - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] defines += [ "ENABLE_SENSOR_PART" ] diff --git a/brightness_manager/include/brightness_service.h b/brightness_manager/include/brightness_service.h index 4ecdb55..c13856a 100644 --- a/brightness_manager/include/brightness_service.h +++ b/brightness_manager/include/brightness_service.h @@ -32,11 +32,7 @@ #include "calculation_manager.h" #include "display_common.h" #include "display_power_info.h" -#ifdef SCENE_BOARD_ENABLED -#include "display_manager_lite.h" -#else #include "display_manager.h" -#endif #include "dm_common.h" #include "iremote_object.h" #include "idisplay_brightness_callback.h" @@ -74,11 +70,7 @@ public: double mDiscount{1.0}; }; -#ifdef SCENE_BOARD_ENABLED - class FoldStatusLisener : public Rosen::DisplayManagerLite::IFoldStatusListener { -#else class FoldStatusLisener : public Rosen::DisplayManager::IFoldStatusListener { -#endif public: FoldStatusLisener() = default; virtual ~FoldStatusLisener() = default; @@ -234,11 +226,7 @@ private: std::shared_ptr mDimming; LightLuxManager mLightLuxManager{}; BrightnessCalculationManager mBrightnessCalculationManager{}; -#ifdef SCENE_BOARD_ENABLED - sptr mFoldStatusistener; -#else sptr mFoldStatusistener; -#endif std::shared_ptr queue_; bool mIsUserMode{false}; std::atomic mIsSleepStatus{false}; diff --git a/brightness_manager/src/brightness_action.cpp b/brightness_manager/src/brightness_action.cpp index a70d58c..e77cac6 100644 --- a/brightness_manager/src/brightness_action.cpp +++ b/brightness_manager/src/brightness_action.cpp @@ -19,14 +19,9 @@ #include #include "display_log.h" -#include "dm_common.h" -#ifdef SCENE_BOARD_ENABLED -#include "display_manager_lite.h" -#include "screen_manager_lite.h" -#else #include "display_manager.h" +#include "dm_common.h" #include "screen_manager.h" -#endif namespace OHOS { namespace DisplayPowerMgr { @@ -46,11 +41,7 @@ void BrightnessAction::SetDisplayId(uint32_t displayId) DisplayState BrightnessAction::GetDisplayState() { DisplayState state = DisplayState::DISPLAY_UNKNOWN; -#ifdef SCENE_BOARD_ENABLED - Rosen::ScreenPowerState powerState = Rosen::ScreenManagerLite::GetInstance().GetScreenPower(mDisplayId); -#else Rosen::ScreenPowerState powerState = Rosen::ScreenManager::GetInstance().GetScreenPower(mDisplayId); -#endif DISPLAY_HILOGI(FEAT_STATE, "ScreenPowerState=%{public}d", static_cast(powerState)); switch (powerState) { case Rosen::ScreenPowerState::POWER_ON: @@ -76,11 +67,7 @@ uint32_t BrightnessAction::GetBrightness() { std::lock_guard lock(mMutexBrightness); std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - mBrightness = Rosen::DisplayManagerLite::GetInstance().GetScreenBrightness(mDisplayId); -#else mBrightness = Rosen::DisplayManager::GetInstance().GetScreenBrightness(mDisplayId); -#endif IPCSkeleton::SetCallingIdentity(identity); DISPLAY_HILOGD(FEAT_BRIGHTNESS, "displayId=%{public}u, brightness=%{public}u", mDisplayId, mBrightness); return mBrightness; @@ -97,11 +84,7 @@ bool BrightnessAction::SetBrightness(uint32_t displayId, uint32_t value) mDisplayId, displayId, value); DISPLAY_HILOGD(FEAT_BRIGHTNESS, "displayId=%{public}u, brightness=%{public}u", displayId, value); std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - bool isSucc = Rosen::DisplayManagerLite::GetInstance().SetScreenBrightness(displayId, value); -#else bool isSucc = Rosen::DisplayManager::GetInstance().SetScreenBrightness(displayId, value); -#endif IPCSkeleton::SetCallingIdentity(identity); std::lock_guard lock(mMutexBrightness); mBrightness = isSucc ? value : mBrightness; diff --git a/brightness_manager/src/brightness_service.cpp b/brightness_manager/src/brightness_service.cpp index b678263..e08e036 100644 --- a/brightness_manager/src/brightness_service.cpp +++ b/brightness_manager/src/brightness_service.cpp @@ -26,15 +26,7 @@ #include "delayed_sp_singleton.h" #include "display_common.h" #include "display_log.h" - -#ifdef SCENE_BOARD_ENABLED -#include "display_manager_lite.h" -#include "screen_manager_lite.h" -#else #include "display_manager.h" -#include "screen_manager.h" -#endif - #include "dm_common.h" #include "errors.h" #include "ffrt_utils.h" @@ -42,6 +34,7 @@ #include "new" #include "permission.h" #include "refbase.h" +#include "screen_manager.h" #include "setting_provider.h" #include "system_ability_definition.h" @@ -117,22 +110,14 @@ void BrightnessService::Init(uint32_t defaultMax, uint32_t defaultMin) } #ifdef ENABLE_SENSOR_PART InitSensors(); -#ifdef SCENE_BOARD_ENABLED - mIsFoldDevice = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else mIsFoldDevice = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif DISPLAY_HILOGI(FEAT_BRIGHTNESS, "Init mIsFoldDevice=%{public}d", mIsFoldDevice); #endif ConfigParse::Get().Initialize(); mLightLuxManager.InitParameters(); mBrightnessCalculationManager.InitParameters(); -#ifdef SCENE_BOARD_ENABLED - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else bool isFoldable = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif brightnessValueMax = defaultMax; brightnessValueMin = defaultMin; DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::init isFoldable=%{public}d, max=%{public}u, min=%{public}u", @@ -144,11 +129,7 @@ void BrightnessService::Init(uint32_t defaultMax, uint32_t defaultMin) void BrightnessService::DeInit() { -#ifdef SCENE_BOARD_ENABLED - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else bool isFoldable = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::init isFoldable=%{public}d", isFoldable); if (isFoldable) { UnRegisterFoldStatusListener(); @@ -214,13 +195,9 @@ void BrightnessService::RegisterFoldStatusListener() DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::RegisterDisplayModeListener newListener failed"); return; } -#ifdef SCENE_BOARD_ENABLED - auto ret = Rosen::DisplayManagerLite::GetInstance().RegisterFoldStatusListener(mFoldStatusistener); -#else auto ret = Rosen::DisplayManager::GetInstance().RegisterFoldStatusListener(mFoldStatusistener); -#endif if (ret != Rosen::DMError::DM_OK) { - DISPLAY_HILOGI(FEAT_BRIGHTNESS, "Rosen::DisplayManagerLite::RegisterDisplayModeListener failed"); + DISPLAY_HILOGI(FEAT_BRIGHTNESS, "Rosen::DisplayManager::RegisterDisplayModeListener failed"); mFoldStatusistener = nullptr; } else { DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::RegisterDisplayModeListener success"); @@ -233,11 +210,7 @@ void BrightnessService::UnRegisterFoldStatusListener() DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::UnRegistermFoldStatusistener listener is null"); return; } -#ifdef SCENE_BOARD_ENABLED - auto ret = Rosen::DisplayManagerLite::GetInstance().UnregisterFoldStatusListener(mFoldStatusistener); -#else auto ret = Rosen::DisplayManager::GetInstance().UnregisterFoldStatusListener(mFoldStatusistener); -#endif if (ret != Rosen::DMError::DM_OK) { DISPLAY_HILOGI(FEAT_BRIGHTNESS, "BrightnessService::UnRegisterDisplayModeListener failed"); } @@ -302,21 +275,13 @@ void BrightnessService::NotifyLightChangeToAps(uint32_t type, float value) uint32_t BrightnessService::GetCurrentDisplayId(uint32_t defaultId) { uint32_t currentId = defaultId; -#ifdef SCENE_BOARD_ENABLED - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else bool isFoldable = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif if (!isFoldable) { DISPLAY_HILOGI(FEAT_STATE, "GetCurrentDisplayId not fold phone return default id=%{public}d", defaultId); return currentId; } std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - auto foldMode = Rosen::DisplayManagerLite::GetInstance().GetFoldDisplayMode(); -#else auto foldMode = Rosen::DisplayManager::GetInstance().GetFoldDisplayMode(); -#endif currentId = static_cast(GetDisplayIdWithDisplayMode(foldMode)); DISPLAY_HILOGI(FEAT_STATE, "GetCurrentDisplayId foldMode=%{public}u", foldMode); IPCSkeleton::SetCallingIdentity(identity); @@ -642,21 +607,13 @@ void BrightnessService::DeactivateAmbientSensor1() void BrightnessService::ActivateValidAmbientSensor() { DISPLAY_HILOGI(FEAT_BRIGHTNESS, "ActivateValidAmbientSensor"); -#ifdef SCENE_BOARD_ENABLED - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else bool isFoldable = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif if (!isFoldable) { ActivateAmbientSensor(); return; } std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - auto foldMode = Rosen::DisplayManagerLite::GetInstance().GetFoldDisplayMode(); -#else auto foldMode = Rosen::DisplayManager::GetInstance().GetFoldDisplayMode(); -#endif int sensorId = GetSensorIdWithDisplayMode(foldMode); DISPLAY_HILOGI(FEAT_BRIGHTNESS, "ActivateValidAmbientSensor sensorId=%{public}d, mode=%{public}d", sensorId, foldMode); @@ -671,21 +628,13 @@ void BrightnessService::ActivateValidAmbientSensor() void BrightnessService::DeactivateValidAmbientSensor() { DISPLAY_HILOGI(FEAT_BRIGHTNESS, "DeactivateValidAmbientSensor"); -#ifdef SCENE_BOARD_ENABLED - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else bool isFoldable = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif if (!isFoldable) { DeactivateAmbientSensor(); return; } std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - auto foldMode = Rosen::DisplayManagerLite::GetInstance().GetFoldDisplayMode(); -#else auto foldMode = Rosen::DisplayManager::GetInstance().GetFoldDisplayMode(); -#endif int sensorId = GetSensorIdWithDisplayMode(foldMode); DISPLAY_HILOGI(FEAT_BRIGHTNESS, "DeactivateValidAmbientSensor sensorId=%{public}d, mode=%{public}d", sensorId, foldMode); @@ -700,11 +649,7 @@ void BrightnessService::DeactivateValidAmbientSensor() void BrightnessService::DeactivateAllAmbientSensor() { DISPLAY_HILOGI(FEAT_BRIGHTNESS, "DeactivateAllAmbientSensor"); -#ifdef SCENE_BOARD_ENABLED - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else bool isFoldable = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif if (!isFoldable) { DeactivateAmbientSensor(); return; @@ -1255,21 +1200,13 @@ bool BrightnessService::GetIsSupportLightSensor() bool BrightnessService::IsCurrentSensorEnable() { -#ifdef SCENE_BOARD_ENABLED - bool isFoldable = Rosen::DisplayManagerLite::GetInstance().IsFoldable(); -#else bool isFoldable = Rosen::DisplayManager::GetInstance().IsFoldable(); -#endif if (!isFoldable) { return mIsLightSensorEnabled; } bool result = false; std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - auto foldMode = Rosen::DisplayManagerLite::GetInstance().GetFoldDisplayMode(); -#else auto foldMode = Rosen::DisplayManager::GetInstance().GetFoldDisplayMode(); -#endif int sensorId = GetSensorIdWithDisplayMode(foldMode); if (sensorId == SENSOR_TYPE_ID_AMBIENT_LIGHT) { result = mIsLightSensorEnabled; diff --git a/brightness_manager/test/unittest/BUILD.gn b/brightness_manager/test/unittest/BUILD.gn index 943d525..ff3a229 100644 --- a/brightness_manager/test/unittest/BUILD.gn +++ b/brightness_manager/test/unittest/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("brightness_manager_test") { external_deps = [ "ability_base:want", "ability_base:zuri", + "ability_runtime:ability_manager", "c_utils:utils", "common_event_service:cesfwk_innerkits", "data_share:datashare_consumer", @@ -59,15 +60,8 @@ ohos_unittest("brightness_manager_test") { "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "window_manager:libdm", ] - - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } } group("unittest") { diff --git a/state_manager/frameworks/napi/BUILD.gn b/state_manager/frameworks/napi/BUILD.gn index 4f570a3..0730c4e 100644 --- a/state_manager/frameworks/napi/BUILD.gn +++ b/state_manager/frameworks/napi/BUILD.gn @@ -31,6 +31,7 @@ ohos_shared_library("brightness") { external_deps = [ "c_utils:utils", + "ets_runtime:libark_jsruntime", "hilog:libhilog", "hiview:libxpower_event_js", "ipc:ipc_core", diff --git a/state_manager/service/BUILD.gn b/state_manager/service/BUILD.gn index c64ff2c..7a32d2b 100644 --- a/state_manager/service/BUILD.gn +++ b/state_manager/service/BUILD.gn @@ -61,10 +61,13 @@ ohos_shared_library("displaymgrservice") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_base:zuri", + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "eventhandler:libeventhandler", "ffrt:libffrt", + "graphic_2d:librender_service_base", "hicollie:libhicollie", "hilog:libhilog", "hisysevent:libhisysevent", @@ -76,6 +79,8 @@ ohos_shared_library("displaymgrservice") { "power_manager:powermgr_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "skia:skia_canvaskit", + "window_manager:libdm", ] defines = [] @@ -84,13 +89,6 @@ ohos_shared_library("displaymgrservice") { defines += [ "ENABLE_SENSOR_PART" ] } - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - shlib_type = "sa" subsystem_name = "powermgr" part_name = "${displaymgr_part_name}" diff --git a/state_manager/service/native/include/screen_action.h b/state_manager/service/native/include/screen_action.h index 491d06c..296b6ce 100644 --- a/state_manager/service/native/include/screen_action.h +++ b/state_manager/service/native/include/screen_action.h @@ -23,11 +23,7 @@ #include #include "dm_common.h" -#ifdef SCENE_BOARD_ENABLED -#include "display_manager_lite.h" -#else #include "display_manager.h" -#endif #include "display_power_info.h" namespace OHOS { diff --git a/state_manager/service/native/src/screen_action.cpp b/state_manager/service/native/src/screen_action.cpp index 739d06c..5ad4f5a 100644 --- a/state_manager/service/native/src/screen_action.cpp +++ b/state_manager/service/native/src/screen_action.cpp @@ -20,11 +20,7 @@ #include "display_log.h" #include "power_state_machine_info.h" -#ifdef SCENE_BOARD_ENABLED -#include "screen_manager_lite.h" -#else #include "screen_manager.h" -#endif namespace OHOS { namespace DisplayPowerMgr { @@ -34,11 +30,7 @@ ScreenAction::ScreenAction(uint32_t displayId) : displayId_(displayId) uint32_t ScreenAction::GetDefaultDisplayId() { std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - uint64_t defaultId = Rosen::DisplayManagerLite::GetInstance().GetDefaultDisplayId(); -#else uint64_t defaultId = Rosen::DisplayManager::GetInstance().GetDefaultDisplayId(); -#endif IPCSkeleton::SetCallingIdentity(identity); return static_cast(defaultId); } @@ -46,11 +38,7 @@ uint32_t ScreenAction::GetDefaultDisplayId() std::vector ScreenAction::GetAllDisplayId() { std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - std::vector allIds = Rosen::DisplayManagerLite::GetInstance().GetAllDisplayIds(); -#else std::vector allIds = Rosen::DisplayManager::GetInstance().GetAllDisplayIds(); -#endif IPCSkeleton::SetCallingIdentity(identity); std::vector displayIds; std::transform(allIds.begin(), allIds.end(), back_inserter(displayIds), [](uint64_t id) { @@ -67,11 +55,7 @@ uint32_t ScreenAction::GetDisplayId() DisplayState ScreenAction::GetDisplayState() { DisplayState state = DisplayState::DISPLAY_UNKNOWN; -#ifdef SCENE_BOARD_ENABLED - Rosen::ScreenPowerState powerState = Rosen::ScreenManagerLite::GetInstance().GetScreenPower(displayId_); -#else Rosen::ScreenPowerState powerState = Rosen::ScreenManager::GetInstance().GetScreenPower(displayId_); -#endif DISPLAY_HILOGI(FEAT_STATE, "ScreenPowerState=%{public}d", static_cast(powerState)); switch (powerState) { case Rosen::ScreenPowerState::POWER_ON: @@ -117,13 +101,7 @@ bool ScreenAction::SetDisplayState(DisplayState state, const std::function(rosenState)); DisplayState state; switch (rosenState) { @@ -203,19 +181,10 @@ bool ScreenAction::SetDisplayPower(DisplayState state, uint32_t reason) bool ret = false; auto changeReason = ParseSpecialReason(reason); if (coordinated_ && reason == static_cast(PowerMgr::StateChangeReason::STATE_CHANGE_REASON_TIMEOUT)) { -#ifdef SCENE_BOARD_ENABLED - ret = Rosen::ScreenManagerLite::GetInstance().SetSpecifiedScreenPower( - displayId_, status, Rosen::PowerStateChangeReason::STATE_CHANGE_REASON_COLLABORATION); -#else ret = Rosen::ScreenManager::GetInstance().SetSpecifiedScreenPower( displayId_, status, Rosen::PowerStateChangeReason::STATE_CHANGE_REASON_COLLABORATION); -#endif } else { -#ifdef SCENE_BOARD_ENABLED - ret = Rosen::ScreenManagerLite::GetInstance().SetScreenPowerForAll(status, changeReason); -#else ret = Rosen::ScreenManager::GetInstance().SetScreenPowerForAll(status, changeReason); -#endif } DISPLAY_HILOGI(FEAT_STATE, "[UL_POWER] SetDisplayPower state=%{public}u, reason=%{public}u, ret=%{public}d, coordinated=%{public}d", @@ -227,11 +196,7 @@ uint32_t ScreenAction::GetBrightness() { std::lock_guard lock(mutexBrightness_); std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - brightness_ = Rosen::DisplayManagerLite::GetInstance().GetScreenBrightness(displayId_); -#else brightness_ = Rosen::DisplayManager::GetInstance().GetScreenBrightness(displayId_); -#endif IPCSkeleton::SetCallingIdentity(identity); DISPLAY_HILOGD(FEAT_BRIGHTNESS, "displayId=%{public}u, brightness=%{public}u", displayId_, brightness_); return brightness_; @@ -241,11 +206,7 @@ bool ScreenAction::SetBrightness(uint32_t value) { DISPLAY_HILOGD(FEAT_BRIGHTNESS, "displayId=%{public}u, brightness=%{public}u", displayId_, value); std::string identity = IPCSkeleton::ResetCallingIdentity(); -#ifdef SCENE_BOARD_ENABLED - bool isSucc = Rosen::DisplayManagerLite::GetInstance().SetScreenBrightness(displayId_, value); -#else bool isSucc = Rosen::DisplayManager::GetInstance().SetScreenBrightness(displayId_, value); -#endif IPCSkeleton::SetCallingIdentity(identity); std::lock_guard lock(mutexBrightness_); brightness_ = isSucc ? value : brightness_; diff --git a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn index e0c123a..0492861 100644 --- a/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/adjustbrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("AdjustBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn index 87a0d2b..a4fc11b 100644 --- a/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/autoadjustbrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("AutoAdjustBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn index d87d8cf..69d53ad 100644 --- a/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/boostbrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("BoostBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn index 96f37c0..3c433ab 100644 --- a/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/discountbrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("DiscountBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn index 57b95a1..742f133 100644 --- a/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/displaystate_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("DisplayStateFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -75,16 +76,9 @@ ohos_fuzztest("DisplayStateFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn index 604b2f9..e4a1eb0 100644 --- a/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getbrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("GetBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("GetBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn index 95acc33..704f449 100644 --- a/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/getdisplayid_fuzzer/BUILD.gn @@ -60,6 +60,7 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -75,16 +76,9 @@ ohos_fuzztest("GetDisplayIdFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn index 0d893df..2cd2eb3 100644 --- a/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridebrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("OverrideBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn index e56b81d..372d3aa 100644 --- a/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/overridedisplayoffdelay_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("OverrideDisplayOffDelayFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn index 078ac6a..869df65 100644 --- a/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/registercallback_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("RegisterCallbackFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn index 392c6f0..0ba6610 100644 --- a/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setbrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("SetBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("SetBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn index 8e5c19c..830f2e1 100644 --- a/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setcoordinated_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("SetCoordinatedFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn index 12baaf3..b505296 100644 --- a/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setlightbrightnessthreshold_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("SetLightBrightnessThresholdFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn index 033a0ee..37a0134 100644 --- a/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn +++ b/state_manager/test/fuzztest/setmaxbrightness_fuzzer/BUILD.gn @@ -61,6 +61,7 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { external_deps = [ "power_manager:power_permission" ] external_deps += [ + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "display_manager:displaymgr", @@ -76,16 +77,9 @@ ohos_fuzztest("SetMaxBrightnessFuzzTest") { "power_manager:power_sysparam", "power_manager:powermgr_client", "safwk:system_ability_fwk", + "window_manager:libdm", ] - defines = [] - if (window_manager_use_sceneboard) { - defines += [ "SCENE_BOARD_ENABLED" ] - external_deps += [ "window_manager:libdm_lite" ] - } else { - external_deps += [ "window_manager:libdm" ] - } - if (has_sensors_sensor_part) { external_deps += [ "sensor:sensor_interface_native" ] } diff --git a/state_manager/test/unittest/BUILD.gn b/state_manager/test/unittest/BUILD.gn index 61142e6..4257cc9 100644 --- a/state_manager/test/unittest/BUILD.gn +++ b/state_manager/test/unittest/BUILD.gn @@ -33,6 +33,7 @@ config("module_private_config") { deps_ex = [ "ability_base:want", "ability_base:zuri", + "ability_runtime:ability_manager", "c_utils:utils", "hilog:libhilog", "ipc:ipc_core", @@ -65,6 +66,7 @@ ohos_unittest("unittest_display_mgr_service") { external_deps = [ "ability_base:want", "ability_base:zuri", + "ability_runtime:ability_manager", "c_utils:utils", "data_share:datashare_consumer", "hilog:libhilog", -- Gitee