From 8c4c206bd29699a2b8ec0052e97fa973fceb6a17 Mon Sep 17 00:00:00 2001 From: l30031422 Date: Thu, 22 Aug 2024 19:54:36 +0800 Subject: [PATCH] feature_fix Signed-off-by: l30031422 Change-Id: I43751c1ffedcd80bc7969f079de0de6a59976429 --- bundle.json | 1 + dm_lite/BUILD.gn | 2 +- sa_profile/BUILD.gn | 2 +- scene_board_enable.gni | 2 +- test/systemtest/wms/BUILD.gn | 2 +- window_scene/BUILD.gn | 2 +- window_scene/interfaces/kits/napi/BUILD.gn | 2 +- .../src/zidl/scene_session_manager_lite_stub.cpp | 2 +- .../session_manager/src/zidl/scene_session_manager_stub.cpp | 2 +- wm/test/unittest/BUILD.gn | 4 ++-- wmserver/BUILD.gn | 6 +++--- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/bundle.json b/bundle.json index f12177db62..3309d77184 100755 --- a/bundle.json +++ b/bundle.json @@ -17,6 +17,7 @@ "SystemCapability.Window.SessionManager" ], "features": [ + "window_manager_use_sceneboard", "window_manager_feature_coverage = false", "window_manager_dayu210_resource_config", "window_manager_feature_subscribe_motion", diff --git a/dm_lite/BUILD.gn b/dm_lite/BUILD.gn index b2d8317df1..6b2a9d38fb 100644 --- a/dm_lite/BUILD.gn +++ b/dm_lite/BUILD.gn @@ -72,7 +72,7 @@ ohos_shared_library("libdm_lite") { group("test") { testonly = true - if (scene_board_enabled) { + if (window_manager_use_sceneboard) { deps = [ "test:test" ] } else { deps = [] diff --git a/sa_profile/BUILD.gn b/sa_profile/BUILD.gn index 0174df3ed0..f96453a42e 100644 --- a/sa_profile/BUILD.gn +++ b/sa_profile/BUILD.gn @@ -16,7 +16,7 @@ import("../windowmanager_aafwk.gni") ohos_sa_profile("wms_sa_profile") { sources = [ "4606.json" ] - if (scene_board_enabled) { + if (window_manager_use_sceneboard) { sources += [ "scene_board/4607.json" ] } else { sources += [ "4607.json" ] diff --git a/scene_board_enable.gni b/scene_board_enable.gni index 9dd0977952..50a6e43eed 100644 --- a/scene_board_enable.gni +++ b/scene_board_enable.gni @@ -13,4 +13,4 @@ import("//build/ohos.gni") -print("scene_board_enabled = ${scene_board_enabled}") +print("window_manager_use_sceneboard = ${window_manager_use_sceneboard}") diff --git a/test/systemtest/wms/BUILD.gn b/test/systemtest/wms/BUILD.gn index 7afdda0084..783e029dd1 100644 --- a/test/systemtest/wms/BUILD.gn +++ b/test/systemtest/wms/BUILD.gn @@ -49,7 +49,7 @@ group("systemtest") { ":wms_window_visibility_info_test", ":wms_window_water_mark_test", ] - if (!scene_board_enabled) { + if (!window_manager_use_sceneboard) { deps += [ ":wms_window_move_drag_test" ] } } diff --git a/window_scene/BUILD.gn b/window_scene/BUILD.gn index 4d49a504e8..f15ee2bb00 100644 --- a/window_scene/BUILD.gn +++ b/window_scene/BUILD.gn @@ -23,7 +23,7 @@ group("window_scene") { "session_manager:screen_session_manager", "session_manager:session_manager", ] - if (scene_board_enabled) { + if (window_manager_use_sceneboard) { public_deps += [ "session_manager_service:session_manager_service" ] } } diff --git a/window_scene/interfaces/kits/napi/BUILD.gn b/window_scene/interfaces/kits/napi/BUILD.gn index df82b3b835..1f22a4409d 100644 --- a/window_scene/interfaces/kits/napi/BUILD.gn +++ b/window_scene/interfaces/kits/napi/BUILD.gn @@ -20,7 +20,7 @@ group("window_scene_napi_packages") { "screen_session_manager:screensessionmanager_napi", "transaction_manager:transactionmanager_napi", ] - if (scene_board_enabled) { + if (window_manager_use_sceneboard) { public_deps += [ "session_manager_service:sessionmanagerservice_napi" ] } } diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp index 9ec7793213..b0e46da66a 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_lite_stub.cpp @@ -199,7 +199,7 @@ int SceneSessionManagerLiteStub::HandleUnRegisterSessionListener(MessageParcel& WLOGFD("run HandleUnRegisterSessionListener!"); sptr listener = iface_cast(data.ReadRemoteObject()); if (listener == nullptr) { - reply.WriteInt32(static_cast(WSError::WS_OK)); + reply.WriteInt32(static_cast(WSError::WS_ERROR_INVALID_PARAM)); return ERR_NONE; } WSError errCode = UnRegisterSessionListener(listener); diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp index d7ee698879..13fa74dce3 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_stub.cpp @@ -432,7 +432,7 @@ int SceneSessionManagerStub::HandleUnRegisterSessionListener(MessageParcel& data WLOGFI("run HandleUnRegisterSessionListener!"); sptr listener = iface_cast(data.ReadRemoteObject()); if (listener == nullptr) { - reply.WriteInt32(static_cast(WSError::WS_OK)); + reply.WriteInt32(static_cast(WSError::WS_ERROR_INVALID_PARAM)); WLOGFI("listener is nullptr"); return ERR_NONE; } diff --git a/wm/test/unittest/BUILD.gn b/wm/test/unittest/BUILD.gn index cc3a1571b0..adab3e46fa 100644 --- a/wm/test/unittest/BUILD.gn +++ b/wm/test/unittest/BUILD.gn @@ -61,10 +61,10 @@ group("unittest") { ":wm_window_stub_test", ":wm_window_test", ] - if (!scene_board_enabled) { + if (!window_manager_use_sceneboard) { deps += [ ":wm_window_proxy_test" ] } - if (scene_board_enabled) { + if (window_manager_use_sceneboard) { deps += [ ":wm_window_manager_lite_test" ] } } diff --git a/wmserver/BUILD.gn b/wmserver/BUILD.gn index 2e881bf48b..3e53cde7d5 100644 --- a/wmserver/BUILD.gn +++ b/wmserver/BUILD.gn @@ -120,7 +120,7 @@ ohos_shared_library("sms") { "input:libmmi-client", "input:libmmi-napi", ] - if (scene_board_enabled) { + if (window_manager_use_sceneboard) { deps += [ "${window_base_path}/window_scene/session_manager_service:session_manager_service" ] } if (is_standard_system) { @@ -133,7 +133,7 @@ ohos_shared_library("sms") { subsystem_name = "window" } -if (scene_board_enabled) { +if (window_manager_use_sceneboard) { group("libwms") { deps = [ "../etc:wms_etc" ] } @@ -276,7 +276,7 @@ if (scene_board_enabled) { group("test") { testonly = true - if (scene_board_enabled) { + if (window_manager_use_sceneboard) { deps = [] } else { deps = [ "test:test" ]