openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-11-27 00:51:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feature_fix

Browse Source 
Signed-off-by: l30031422 <liwei769@huawei.com>
Change-Id: I43751c1ffedcd80bc7969f079de0de6a59976429
This commit is contained in:
l30031422 2024-08-22 19:54:36 +08:00
parent ea66d03026
commit 8c4c206bd2
11 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundle.json
View File

@ -17,6 +17,7 @@
"SystemCapability.Window.SessionManager" "SystemCapability.Window.SessionManager"
], ],
"features": [ "features": [
"window_manager_use_sceneboard",
"window_manager_feature_coverage = false", "window_manager_feature_coverage = false",
"window_manager_dayu210_resource_config", "window_manager_dayu210_resource_config",
"window_manager_feature_subscribe_motion", "window_manager_feature_subscribe_motion",

2
dm_lite/BUILD.gn
View File

@ -72,7 +72,7 @@ ohos_shared_library("libdm_lite") {
group("test") { group("test") {
testonly = true testonly = true
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
deps = [ "test:test" ] deps = [ "test:test" ]
} else { } else {
deps = [] deps = []

2
sa_profile/BUILD.gn
View File

@ -16,7 +16,7 @@ import("../windowmanager_aafwk.gni")
ohos_sa_profile("wms_sa_profile") { ohos_sa_profile("wms_sa_profile") {
sources = [ "4606.json" ] sources = [ "4606.json" ]
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
sources += [ "scene_board/4607.json" ] sources += [ "scene_board/4607.json" ]
} else { } else {
sources += [ "4607.json" ] sources += [ "4607.json" ]

2
scene_board_enable.gni
View File

@ -13,4 +13,4 @@
import("//build/ohos.gni") import("//build/ohos.gni")
print("scene_board_enabled = ${scene_board_enabled}") print("window_manager_use_sceneboard = ${window_manager_use_sceneboard}")

2
test/systemtest/wms/BUILD.gn
View File

@ -49,7 +49,7 @@ group("systemtest") {
":wms_window_visibility_info_test", ":wms_window_visibility_info_test",
":wms_window_water_mark_test", ":wms_window_water_mark_test",
] ]
if (!scene_board_enabled) { if (!window_manager_use_sceneboard) {
deps += [ ":wms_window_move_drag_test" ] deps += [ ":wms_window_move_drag_test" ]
} }
} }

2
window_scene/BUILD.gn
View File

@ -23,7 +23,7 @@ group("window_scene") {
"session_manager:screen_session_manager", "session_manager:screen_session_manager",
"session_manager:session_manager", "session_manager:session_manager",
] ]
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
public_deps += [ "session_manager_service:session_manager_service" ] public_deps += [ "session_manager_service:session_manager_service" ]
} }
} }

2
window_scene/interfaces/kits/napi/BUILD.gn
View File

@ -20,7 +20,7 @@ group("window_scene_napi_packages") {
"screen_session_manager:screensessionmanager_napi", "screen_session_manager:screensessionmanager_napi",
"transaction_manager:transactionmanager_napi", "transaction_manager:transactionmanager_napi",
] ]
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
public_deps += [ "session_manager_service:sessionmanagerservice_napi" ] public_deps += [ "session_manager_service:sessionmanagerservice_napi" ]
} }
} }

2
window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp
View File

@ -199,7 +199,7 @@ int SceneSessionManagerLiteStub::HandleUnRegisterSessionListener(MessageParcel&
WLOGFD("run HandleUnRegisterSessionListener!"); WLOGFD("run HandleUnRegisterSessionListener!");
sptr<ISessionListener> listener = iface_cast<ISessionListener>(data.ReadRemoteObject()); sptr<ISessionListener> listener = iface_cast<ISessionListener>(data.ReadRemoteObject());
if (listener == nullptr) { if (listener == nullptr) {
reply.WriteInt32(static_cast<int32_t>(WSError::WS_OK)); reply.WriteInt32(static_cast<int32_t>(WSError::WS_ERROR_INVALID_PARAM));
return ERR_NONE; return ERR_NONE;
} }
WSError errCode = UnRegisterSessionListener(listener); WSError errCode = UnRegisterSessionListener(listener);

2
window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp
View File

@ -432,7 +432,7 @@ int SceneSessionManagerStub::HandleUnRegisterSessionListener(MessageParcel& data
WLOGFI("run HandleUnRegisterSessionListener!"); WLOGFI("run HandleUnRegisterSessionListener!");
sptr<ISessionListener> listener = iface_cast<ISessionListener>(data.ReadRemoteObject()); sptr<ISessionListener> listener = iface_cast<ISessionListener>(data.ReadRemoteObject());
if (listener == nullptr) { if (listener == nullptr) {
reply.WriteInt32(static_cast<int32_t>(WSError::WS_OK)); reply.WriteInt32(static_cast<int32_t>(WSError::WS_ERROR_INVALID_PARAM));
WLOGFI("listener is nullptr"); WLOGFI("listener is nullptr");
return ERR_NONE; return ERR_NONE;
} }

4
wm/test/unittest/BUILD.gn
View File

@ -61,10 +61,10 @@ group("unittest") {
":wm_window_stub_test", ":wm_window_stub_test",
":wm_window_test", ":wm_window_test",
] ]
if (!scene_board_enabled) { if (!window_manager_use_sceneboard) {
deps += [ ":wm_window_proxy_test" ] deps += [ ":wm_window_proxy_test" ]
} }
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
deps += [ ":wm_window_manager_lite_test" ] deps += [ ":wm_window_manager_lite_test" ]
} }
} }

6
wmserver/BUILD.gn
View File

@ -120,7 +120,7 @@ ohos_shared_library("sms") {
"input:libmmi-client", "input:libmmi-client",
"input:libmmi-napi", "input:libmmi-napi",
] ]
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
deps += [ "${window_base_path}/window_scene/session_manager_service:session_manager_service" ] deps += [ "${window_base_path}/window_scene/session_manager_service:session_manager_service" ]
} }
if (is_standard_system) { if (is_standard_system) {
@ -133,7 +133,7 @@ ohos_shared_library("sms") {
subsystem_name = "window" subsystem_name = "window"
} }
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
group("libwms") { group("libwms") {
deps = [ "../etc:wms_etc" ] deps = [ "../etc:wms_etc" ]
} }
@ -276,7 +276,7 @@ if (scene_board_enabled) {
group("test") { group("test") {
testonly = true testonly = true
if (scene_board_enabled) { if (window_manager_use_sceneboard) {
deps = [] deps = []
} else { } else {
deps = [ "test:test" ] deps = [ "test:test" ]