Star35
793
代码
代码
Issues307
Pull Requests202
项目讨论
Wiki
分析
Star35
793
已合并
dms test #18524
wulong158创建于 3月23日
dms test #18524
已合并
wulong158创建于 3月23日
从wulong158/window_window_managermaster0323合入到openharmony/window_window_managermaster
共 18 个文件变更+162-25
Mutils/include/rs_adapter.h+1-0
@@ -26,6 +26,7 @@
26#include <ui/rs_node.h>26#include <ui/rs_node.h>
27#include <ui/rs_ui_context.h>27#include <ui/rs_ui_context.h>
28#include <ui/rs_ui_director.h>28#include <ui/rs_ui_director.h>
29+#include <event_handler.h>
29 30 
30#define RETURN_IF_RS_CLIENT_MULTI_INSTANCE_DISABLED(...) \31#define RETURN_IF_RS_CLIENT_MULTI_INSTANCE_DISABLED(...) \
31 do { \32 do { \
Mwindow_scene/screen_session_manager/include/fold_screen_controller/sensor_fold_state_manager/dual_display_sensor_fold_state_manager.h+0-4
@@ -16,10 +16,6 @@
16#ifndef OHOS_ROSEN_DUAL_DISPLAY_FOLD_STATE_SENSOR_MANAGER_H16#ifndef OHOS_ROSEN_DUAL_DISPLAY_FOLD_STATE_SENSOR_MANAGER_H
17#define OHOS_ROSEN_DUAL_DISPLAY_FOLD_STATE_SENSOR_MANAGER_H17#define OHOS_ROSEN_DUAL_DISPLAY_FOLD_STATE_SENSOR_MANAGER_H
18 18 
19-#include "app_state_data.h"
20-#include "ability_state_data.h"
21-#include "process_data.h"
22- 
23#include "common/include/task_scheduler.h"19#include "common/include/task_scheduler.h"
24#include "dm_common.h"20#include "dm_common.h"
25#include "fold_screen_controller/fold_screen_policy.h"21#include "fold_screen_controller/fold_screen_policy.h"
Mwindow_scene/screen_session_manager/include/fold_screen_controller/sensor_fold_state_manager/single_display_sensor_pocket_fold_state_manager.h+0-3
@@ -19,10 +19,7 @@
19#include "dm_common.h"19#include "dm_common.h"
20#include "fold_screen_controller/fold_screen_policy.h"20#include "fold_screen_controller/fold_screen_policy.h"
21#include "fold_screen_controller/sensor_fold_state_manager/sensor_fold_state_manager.h"21#include "fold_screen_controller/sensor_fold_state_manager/sensor_fold_state_manager.h"
22-#include "app_state_data.h"
23#include "iapplication_state_observer.h"22#include "iapplication_state_observer.h"
24-#include "ability_state_data.h"
25-#include "process_data.h"
26 23 
27namespace OHOS {24namespace OHOS {
28namespace Rosen {25namespace Rosen {
Mwindow_scene/screen_session_manager/src/fold_screen_controller/sensor_fold_state_manager/dual_display_sensor_fold_state_manager.cpp+0-3
@@ -26,9 +26,6 @@
26#include "app_service_manager.h"26#include "app_service_manager.h"
27#include "app_mgr_constants.h"27#include "app_mgr_constants.h"
28#include "app_mgr_interface.h"28#include "app_mgr_interface.h"
29-#include "app_state_data.h"
30-#include "ability_state_data.h"
31-#include "process_data.h"
32#include "fold_screen_controller/fold_screen_policy.h"29#include "fold_screen_controller/fold_screen_policy.h"
33#include "fold_screen_controller/fold_screen_controller_config.h"30#include "fold_screen_controller/fold_screen_controller_config.h"
34#include "screen_setting_helper.h"31#include "screen_setting_helper.h"
Mwindow_scene/screen_session_manager/src/screen_session_manager.cpp+5-3
@@ -345,10 +345,12 @@ void ScreenSessionManager::LoadDmsExtension()
345}345}
346bool ScreenSessionManager::GetScreenSessionMngSystemAbility()346bool ScreenSessionManager::GetScreenSessionMngSystemAbility()
347{347{
348- if (DEVICE_TYPE != "phone") {348+#ifdef DMS_UNIT_TEST
349- ScreenSessionManager::LoadDmsExtension();349+ return true;
350- }350+#else
351+ ScreenSessionManager::LoadDmsExtension();
351 return SystemAbility::MakeAndRegisterAbility(&ScreenSessionManager::GetInstance());352 return SystemAbility::MakeAndRegisterAbility(&ScreenSessionManager::GetInstance());
353+#endif
352}354}
353const bool REGISTER_RESULT = !SceneBoardJudgement::IsSceneBoardEnabled() ? false : ScreenSessionManager::GetScreenSessionMngSystemAbility();355const bool REGISTER_RESULT = !SceneBoardJudgement::IsSceneBoardEnabled() ? false : ScreenSessionManager::GetScreenSessionMngSystemAbility();
354 356 
Mwindow_scene/screen_session_manager/src/zidl/screen_session_manager_stub.cpp+0-1
@@ -19,7 +19,6 @@
19#include "dm_common.h"19#include "dm_common.h"
20#include <ipc_skeleton.h>20#include <ipc_skeleton.h>
21#include "transaction/rs_marshalling_helper.h"21#include "transaction/rs_marshalling_helper.h"
22-#include "session_manager/include/scene_session_manager.h"
23#include "marshalling_helper.h"22#include "marshalling_helper.h"
24 23 
25namespace OHOS::Rosen {24namespace OHOS::Rosen {
Mwindow_scene/test/dms_unittest/BUILD.gn+1-0
@@ -19,6 +19,7 @@ group("unittest") {
19 testonly = true19 testonly = true
20 20 
21 deps = [21 deps = [
22+ "screen_session_manager_test:unittest",
22 ":ws_screen_cutout_controller_test",23 ":ws_screen_cutout_controller_test",
23 ":ws_screen_edid_test",24 ":ws_screen_edid_test",
24 ":ws_screen_edid_parse_test",25 ":ws_screen_edid_parse_test",
Mwindow_scene/test/dms_unittest/dms_test_framework/dms_test_base.h+1-0
@@ -117,6 +117,7 @@ public:
117 MOCK_METHOD(void, NotifyBrightnessInfoChanged, (ScreenId screenId, const ScreenBrightnessInfo& info), (override));117 MOCK_METHOD(void, NotifyBrightnessInfoChanged, (ScreenId screenId, const ScreenBrightnessInfo& info), (override));
118 MOCK_METHOD(void, OnDisplayAttributeChange,118 MOCK_METHOD(void, OnDisplayAttributeChange,
119 (sptr<DisplayInfo> displayInfo, const std::vector<std::string>& attributes), (override));119 (sptr<DisplayInfo> displayInfo, const std::vector<std::string>& attributes), (override));
120+ MOCK_METHOD(void, NotifyRecordingDisplayChanged, (const std::vector<DisplayId>& displayIds), (override));
120};121};
121 122 
122class DmsTestBase : public testing::Test {123class DmsTestBase : public testing::Test {
Mwindow_scene/test/dms_unittest/mock/init/parameter.h+1-1
@@ -15,7 +15,7 @@
15 15 
16#ifndef STARTUP_SYSPARAM_PARAMETER_API_H16#ifndef STARTUP_SYSPARAM_PARAMETER_API_H
17#define STARTUP_SYSPARAM_PARAMETER_API_H17#define STARTUP_SYSPARAM_PARAMETER_API_H
18-#include <cstdint.h>18+#include <cstdint>
19#ifdef __cplusplus19#ifdef __cplusplus
20#if __cplusplus20#if __cplusplus
21extern "C" {21extern "C" {
Awindow_scene/test/dms_unittest/mock/inner_mock/mock_permission.cpp+61-0
@@ -0,0 +1,61 @@
1+/*
2+ * Copyright (c) 2022 Huawei Device Co., Ltd.
3+ * Licensed under the Apache License, Version 2.0 (the "License");
4+ * you may not use this file except in compliance with the License.
5+ * You may obtain a copy of the License at
6+ *
7+ * http://www.apache.org/licenses/LICENSE-2.0
8+ *
9+ * Unless required by applicable law or agreed to in writing, software
10+ * distributed under the License is distributed on an "AS IS" BASIS,
11+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+ * See the License for the specific language governing permissions and
13+ * limitations under the License.
14+ */
15+ 
16+#include "permission.h"
17+ 
18+namespace OHOS {
19+namespace Rosen {
20+ 
21+bool Permission::IsSystemServiceCalling(bool needPrintLog, bool isLocalSysCalling)
22+{
23+ return true;
24+}
25+ 
26+bool Permission::IsSystemCallingOrStartByHdcd(bool isLocalSysCalling)
27+{
28+ return true;
29+}
30+ 
31+bool Permission::IsSystemCalling(bool isLocalSysCalling)
32+{
33+ return true;
34+}
35+ 
36+bool Permission::CheckCallingPermission(const std::string& permission)
37+{
38+ return true;
39+}
40+ 
41+bool Permission::IsStartByHdcd(bool isLocalSysCalling)
42+{
43+ return true;
44+}
45+ 
46+bool Permission::IsStartByInputMethod()
47+{
48+ return true;
49+}
50+ 
51+bool Permission::CheckIsCallingBundleName(const std::string name)
52+{
53+ return true;
54+}
55+ 
56+bool Permission::IsTokenNativeOrShellType(uint32_t tokenId)
57+{
58+ return true;
59+}
60+} // namespace Rosen
61+} // namespace OHOS
Mwindow_scene/test/dms_unittest/mock/inner_mock/mock_scene_board_judgement.cpp+1-1
@@ -27,6 +27,6 @@ std::ifstream& SceneBoardJudgement::SafeGetLine(std::ifstream& configFile, std::
27 return configFile;27 return configFile;
28}28}
29 29 
30-void SceneBoardJudgement::IintWithConfigFile(const char* filePath, bool& enabled) {}30+void SceneBoardJudgement::InitWithConfigFile(const char* filePath, bool& enabled) {}
31} // namespace Rosen31} // namespace Rosen
32} // namespace OHOS32} // namespace OHOS
Mwindow_scene/test/dms_unittest/mock/inner_mock/mock_screen_scene_config.cpp+20-2
@@ -17,7 +17,7 @@
17 17 
18namespace OHOS::Rosen {18namespace OHOS::Rosen {
19namespace {19namespace {
20-constexpr uint32_t NO_EARTERFALL_DISPLAY_COMPRESSION_SIZE = 0;20+constexpr uint32_t NO_WATERFALL_DISPLAY_COMPRESSION_SIZE = 0;
21constexpr uint32_t DISPLAY_PHYSICAL_SIZE = 2;21constexpr uint32_t DISPLAY_PHYSICAL_SIZE = 2;
22constexpr uint32_t SCROLLABLE_PARAM_SIZE = 2;22constexpr uint32_t SCROLLABLE_PARAM_SIZE = 2;
23enum XmlNodeElement {23enum XmlNodeElement {
@@ -78,6 +78,9 @@ bool ScreenSceneConfig::isSupportOffScreenRendering_ = false;
78bool ScreenSceneConfig::isConcurrentUser_ = false;78bool ScreenSceneConfig::isConcurrentUser_ = false;
79uint32_t ScreenSceneConfig::curvedAreaInLandscape_ = 0;79uint32_t ScreenSceneConfig::curvedAreaInLandscape_ = 0;
80uint32_t ScreenSceneConfig::offScreenPPIThreshold_ = 0;80uint32_t ScreenSceneConfig::offScreenPPIThreshold_ = 0;
81+uint64_t ScreenSceneConfig::bootTimeThreshold_ = 60;
82+int32_t ScreenSceneConfig::rogDpi_ = 0;
83+RogResolution ScreenSceneConfig::rogResolution_ = { false, true, 0, 0, 0, 0 };
81std::map<int32_t, std::string> ScreenSceneConfig::xmlNodeMap_ = {84std::map<int32_t, std::string> ScreenSceneConfig::xmlNodeMap_ = {
82 {DPI, "dpi"},85 {DPI, "dpi"},
83 {SUB_DPI, "subDpi"},86 {SUB_DPI, "subDpi"},
@@ -255,7 +258,7 @@ void ScreenSceneConfig::SetSubCutoutSvgPath(const std::string& svgPath)
255DMRect ScreenSceneConfig::CalcCutoutBoundaryRect(std::string svgPath)258DMRect ScreenSceneConfig::CalcCutoutBoundaryRect(std::string svgPath)
256{259{
257 DMRect emptyRect = { 0, 0, 0, 0 };260 DMRect emptyRect = { 0, 0, 0, 0 };
258- return cutoutMinOuterRect;261+ return emptyRect;
259}262}
260 263 
261std::vector<DMRect> ScreenSceneConfig::GetCutoutBoundaryRect(uint64_t displayId)264std::vector<DMRect> ScreenSceneConfig::GetCutoutBoundaryRect(uint64_t displayId)
@@ -346,4 +349,19 @@ uint32_t ScreenSceneConfig::GetNumberConfigValue(const std::string& name, const
346 return default_value;349 return default_value;
347}350}
348 351 
352+RogResolution ScreenSceneConfig::GetRogResolution(uint32_t width, uint32_t height)
353+{
354+ return rogResolution_;
355+}
356+ 
357+uint64_t ScreenSceneConfig::GetUptimeSeconds()
358+{
359+ return 0;
360+}
361+ 
362+uint64_t ScreenSceneConfig::GetBootTimeThreshold()
363+{
364+ return bootTimeThreshold_;
365+}
366+ 
349} // namespace OHOS::Rosen367} // namespace OHOS::Rosen
Awindow_scene/test/dms_unittest/mock/power_manager/screenlock_manager.h+44-0
@@ -0,0 +1,44 @@
1+/*
2+ * Copyright (c) 2025 Huawei Device Co., Ltd.
3+ * Licensed under the Apache License, Version 2.0 (the "License");
4+ * you may not use this file except in compliance with the License.
5+ * You may obtain a copy of the License at
6+ *
7+ * http://www.apache.org/licenses/LICENSE-2.0
8+ *
9+ * Unless required by applicable law or agreed to in writing, software
10+ * distributed under the License is distributed on an "AS IS" BASIS,
11+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+ * See the License for the specific language governing permissions and
13+ * limitations under the License.
14+ */
15+ 
16+#ifndef TEST_SCREEN_LOCK_MANAGER_H
17+#define TEST_SCREEN_LOCK_MANAGER_H
18+ 
19+namespace OHOS {
20+namespace ScreenLock {
21+ 
22+class ScreenLockManager {
23+public:
24+ static ScreenLockManager* GetInstance()
25+ {
26+ static ScreenLockManager instance;
27+ return &instance;
28+ }
29+ 
30+ int32_t Lock(int32_t userId)
31+ {
32+ return 0;
33+ }
34+ 
35+ bool IsScreenLocked()
36+ {
37+ return false;
38+ }
39+};
40+ 
41+} // namespace ScreenLock
42+} // namespace OHOS
43+ 
44+#endif
Mwindow_scene/test/dms_unittest/mock/product_mock/product_config_mock.cpp+1-1
@@ -49,7 +49,7 @@ void ProductConfigMock::ResetToPLR()
49 currentConfig_.innerScreenId_ = {0};49 currentConfig_.innerScreenId_ = {0};
50 currentConfig_.screenActiveModeId_ = {{0, 3}};50 currentConfig_.screenActiveModeId_ = {{0, 3}};
51 currentConfig_.screenModeInfo_ = {{0,51 currentConfig_.screenModeInfo_ = {{0,
52- {{1316. 2832, 120, 0},52+ {{1316, 2832, 120, 0},
53 {1316, 2832, 90, 1},53 {1316, 2832, 90, 1},
54 {1316, 2832, 72, 2},54 {1316, 2832, 72, 2},
55 {1316, 2832, 60, 3},55 {1316, 2832, 60, 3},
Mwindow_scene/test/dms_unittest/mock/rs/rs_vector4_mock.h+1-1
@@ -356,7 +356,7 @@ Vector4<T> Vector4<T>::operator+(const Vector4<T>& other) const
356 return Vector4<T>(356 return Vector4<T>(
357 thisData[0] + otherData[0],357 thisData[0] + otherData[0],
358 thisData[1] + otherData[1],358 thisData[1] + otherData[1],
359- thisData[[INDEX_TWO]] + otherData[[INDEX_TWO]],359+ thisData[INDEX_TWO] + otherData[INDEX_TWO],
360 thisData[INDEX_THREE] + otherData[INDEX_THREE]);360 thisData[INDEX_THREE] + otherData[INDEX_THREE]);
361}361}
362 362 
Mwindow_scene/test/dms_unittest/mock/rs/transaction/mock_rs_interfaces.cpp+8-2
@@ -79,7 +79,7 @@ bool RSInterfaces::TakeSurfaceCapture(std::shared_ptr<RSDisplayNode> node,
79{79{
80 return true;80 return true;
81}81}
82-bool RSInterfaces::FreezeScreen(std::shared_ptr<RSDisplayNode> node, bool isFreeze)82+bool RSInterfaces::FreezeScreen(std::shared_ptr<RSDisplayNode> node, bool isFreeze, bool needSync)
83{83{
84 return true;84 return true;
85}85}
@@ -175,7 +175,8 @@ int32_t RSInterfaces::SetPixelFormat(ScreenId id, GraphicPixelFormat pixelFormat
175{175{
176 return 0;176 return 0;
177}177}
178-int32_t RSInterfaces::GetScreenSupportedHDRFormats(ScreenId id, std::vector<ScreenHDRFormat>& hdrFormats)178+int32_t RSInterfaces::GetScreenSupportedHDRFormats(ScreenId id, std::vector<ScreenHDRFormat>& hdrFormats,
179+ const ScreenSupportedHDRFormatsCallback& callback)
179{180{
180 return RsMockImpl::GetInstance().GetScreenSupportedHDRFormats(id, hdrFormats);181 return RsMockImpl::GetInstance().GetScreenSupportedHDRFormats(id, hdrFormats);
181}182}
@@ -268,5 +269,10 @@ int32_t RSInterfaces::SetLogicalCameraRotationCorrection(ScreenId id, ScreenRota
268{269{
269 return 0;270 return 0;
270}271}
272+ 
273+ScreenId RSInterfaces::GetActiveScreenId()
274+{
275+ return 0;
276+}
271} // namespace Rosen277} // namespace Rosen
272} // namespace OHOS278} // namespace OHOS
Mwindow_scene/test/dms_unittest/mock/rs/transaction/rs_interfaces.h+6-2
@@ -59,6 +59,8 @@ using ScreenSwitchingNotifyCallback = std::function<void(bool)>;
59using BrightnessInfoChangeCallback = std::function<void(ScreenId, BrightnessInfo)>;59using BrightnessInfoChangeCallback = std::function<void(ScreenId, BrightnessInfo)>;
60using HgmRefreshRateUpdateCallback = std::function<void(int32_t)>;60using HgmRefreshRateUpdateCallback = std::function<void(int32_t)>;
61using FirstFrameCommitCallback = std::function<void(uint64_t, int64_t)>;61using FirstFrameCommitCallback = std::function<void(uint64_t, int64_t)>;
62+using ScreenSupportedHDRFormatsCallback = std::function<void(ScreenId,
63+ std::vector<ScreenHDRFormat>& specialHdrFormats)>;
62 64 
63class RSInterfaces {65class RSInterfaces {
64public:66public:
@@ -84,7 +86,7 @@ public:
84 int32_t GetBrightnessInfo(ScreenId screenId, BrightnessInfo& brightnessInfo);86 int32_t GetBrightnessInfo(ScreenId screenId, BrightnessInfo& brightnessInfo);
85 bool TakeSurfaceCapture(std::shared_ptr<RSDisplayNode> node, std::shared_ptr<SurfaceCaptureCallback> callback,87 bool TakeSurfaceCapture(std::shared_ptr<RSDisplayNode> node, std::shared_ptr<SurfaceCaptureCallback> callback,
86 RSSurfaceCaptureConfig captureConfig = {});88 RSSurfaceCaptureConfig captureConfig = {});
87- bool FreezeScreen(std::shared_ptr<RSDisplayNode> node, bool isFreeze);89+ bool FreezeScreen(std::shared_ptr<RSDisplayNode> node, bool isFreeze, bool needSync = false);
88 uint32_t SetScreenActiveMode(ScreenId id, uint32_t modeId);90 uint32_t SetScreenActiveMode(ScreenId id, uint32_t modeId);
89 int32_t SetRogScreenResolution(ScreenId id, uint32_t width, uint32_t height);91 int32_t SetRogScreenResolution(ScreenId id, uint32_t width, uint32_t height);
90 int32_t SetPhysicalScreenResolution(ScreenId id, uint32_t width, uint32_t height);92 int32_t SetPhysicalScreenResolution(ScreenId id, uint32_t width, uint32_t height);
@@ -110,7 +112,8 @@ public:
110 int32_t GetScreenGamutMap(ScreenId id, ScreenGamutMap& mode);112 int32_t GetScreenGamutMap(ScreenId id, ScreenGamutMap& mode);
111 int32_t GetPixelFormat(ScreenId id, GraphicPixelFormat& pixelFormat);113 int32_t GetPixelFormat(ScreenId id, GraphicPixelFormat& pixelFormat);
112 int32_t SetPixelFormat(ScreenId id, GraphicPixelFormat pixelFormat);114 int32_t SetPixelFormat(ScreenId id, GraphicPixelFormat pixelFormat);
113- int32_t GetScreenSupportedHDRFormats(ScreenId id, std::vector<ScreenHDRFormat>& hdrFormats);115+ int32_t GetScreenSupportedHDRFormats(ScreenId id, std::vector<ScreenHDRFormat>& hdrFormats,
116+ const ScreenSupportedHDRFormatsCallback& callback = nullptr);
114 int32_t GetScreenHDRFormat(ScreenId id, ScreenHDRFormat& hdrFormat);117 int32_t GetScreenHDRFormat(ScreenId id, ScreenHDRFormat& hdrFormat);
115 int32_t GetScreenHDRStatus(ScreenId id, HdrStatus& hdrStatus);118 int32_t GetScreenHDRStatus(ScreenId id, HdrStatus& hdrStatus);
116 int32_t SetScreenHDRFormat(ScreenId id, int32_t modeIdx);119 int32_t SetScreenHDRFormat(ScreenId id, int32_t modeIdx);
@@ -141,6 +144,7 @@ public:
141 int32_t AddVirtualScreenWhiteList(ScreenId id, const std::vector<NodeId>& whiteList);144 int32_t AddVirtualScreenWhiteList(ScreenId id, const std::vector<NodeId>& whiteList);
142 int32_t RemoveVirtualScreenWhiteList(ScreenId id, const std::vector<NodeId>& whiteList);145 int32_t RemoveVirtualScreenWhiteList(ScreenId id, const std::vector<NodeId>& whiteList);
143 int32_t SetLogicalCameraRotationCorrection(ScreenId id, ScreenRotation screenRotation);146 int32_t SetLogicalCameraRotationCorrection(ScreenId id, ScreenRotation screenRotation);
147+ ScreenId GetActiveScreenId();
144};148};
145} // namespace Rosen149} // namespace Rosen
146} // namespace OHOS150} // namespace OHOS
Mwindow_scene/test/dms_unittest/screen_session_manager_test/BUILD.gn+11-1
@@ -34,6 +34,7 @@ test_external_deps = [
34 "ability_runtime:abilitykit_native",34 "ability_runtime:abilitykit_native",
35 "ability_runtime:dataobs_manager",35 "ability_runtime:dataobs_manager",
36 "ability_runtime:extension_manager",36 "ability_runtime:extension_manager",
37+ "ability_runtime:ability_connect_callback_stub",
37 "access_token:libaccesstoken_sdk",38 "access_token:libaccesstoken_sdk",
38 "access_token:libprivacy_sdk",39 "access_token:libprivacy_sdk",
39 "access_token:libtokenid_sdk",40 "access_token:libtokenid_sdk",
@@ -118,6 +119,7 @@ test_source_common = [
118 "${window_base_path}/window_scene/screen_session_manager/infra/src/fold_screen/screen_sensor_mgr.cpp",119 "${window_base_path}/window_scene/screen_session_manager/infra/src/fold_screen/screen_sensor_mgr.cpp",
119 "${window_base_path}/window_scene/screen_session_manager/infra/src/fold_screen/sensor_fold_state_mgr.cpp",120 "${window_base_path}/window_scene/screen_session_manager/infra/src/fold_screen/sensor_fold_state_mgr.cpp",
120 "${window_base_path}/window_scene/screen_session_manager/infra/src/common/product_config.cpp",121 "${window_base_path}/window_scene/screen_session_manager/infra/src/common/product_config.cpp",
122+ "${window_base_path}/window_scene/screen_session_manager/infra/src/ffrt/ffrt_queue.cpp",
121 123 
122 # ScreenSession124 # ScreenSession
123 "${window_base_path}/window_scene/session/screen/src/screen_property.cpp",125 "${window_base_path}/window_scene/session/screen/src/screen_property.cpp",
@@ -133,6 +135,13 @@ test_source_common = [
133 "${window_base_path}/utils/src/xml_config_base.cpp",135 "${window_base_path}/utils/src/xml_config_base.cpp",
134 "${window_base_path}/utils/src/cutout_info.cpp",136 "${window_base_path}/utils/src/cutout_info.cpp",
135 "${window_base_path}/utils/src/rs_adapter.cpp",137 "${window_base_path}/utils/src/rs_adapter.cpp",
138+ "${window_base_path}/utils/src/ffrt_queue_helper.cpp",
139+ "${window_base_path}/utils/src/task_sequence_process.cpp",
140+ "${window_base_path}/utils/src/dms_xcollie.cpp",
141+ "${window_base_path}/utils/src/sys_cap_util.cpp",
142+ "${window_base_path}/utils/src/string_util.cpp",
143+ "${window_base_path}/utils/src/screen_info.cpp",
144+ "${window_base_path}/utils/src/screen_group_info.cpp",
136 145 
137 # common146 # common
138 "${window_base_path}/window_scene/common/src/dms_task_scheduler.cpp",147 "${window_base_path}/window_scene/common/src/dms_task_scheduler.cpp",
@@ -147,7 +156,7 @@ test_source_common = [
147 "../mock/product_mock/product_config_mock.cpp",156 "../mock/product_mock/product_config_mock.cpp",
148 "../mock/init/param_mock.cpp",157 "../mock/init/param_mock.cpp",
149 "../mock/inner_mock/mock_screen_scene_config.cpp",158 "../mock/inner_mock/mock_screen_scene_config.cpp",
150- "../mock/inner_mock/mock_param_update_helper.cpp",159+ "../mock/inner_mock/mock_permission.cpp",
151]160]
152 161 
153ohos_unittest("ws_screen_session_manager_connect_test") {162ohos_unittest("ws_screen_session_manager_connect_test") {
@@ -178,6 +187,7 @@ config("dms_unittest_base_config") {
178 "${window_base_path}/window_scene/screen_session_manager/include",187 "${window_base_path}/window_scene/screen_session_manager/include",
179 "${window_base_path}/window_scene/screen_session_manager/infra/include/fold_screen",188 "${window_base_path}/window_scene/screen_session_manager/infra/include/fold_screen",
180 "${window_base_path}/window_scene/screen_session_manager/infra/include/common",189 "${window_base_path}/window_scene/screen_session_manager/infra/include/common",
190+ "${window_base_path}/window_scene/screen_session_manager/infra/include/ffrt",
181 "${window_base_path}/window_scene/screen_session_manager/include/zidl",191 "${window_base_path}/window_scene/screen_session_manager/include/zidl",
182 "${window_base_path}/window_scene/session_manager_service/include",192 "${window_base_path}/window_scene/session_manager_service/include",
183 193