From 1559fbb5a7e251faaa94de48b3e792b95a959c6f Mon Sep 17 00:00:00 2001 From: ReCoder Date: Thu, 27 Mar 2025 10:38:34 +0800 Subject: [PATCH] fix: typos Signed-off-by: ReCoder --- dm/include/display_manager_adapter.h | 2 +- dmserver/include/display_manager_interface.h | 4 ++-- dmserver/include/display_manager_interface_code.h | 2 +- .../kits/napi/display_runtime/js_display_manager.cpp | 4 ++-- .../src/zidl/screen_session_manager_proxy.cpp | 4 ++-- .../src/zidl/screen_session_manager_stub.cpp | 2 +- .../include/zidl/scene_session_manager_interface.h | 8 ++++++-- .../session_manager/src/scene_session_manager.cpp | 2 +- wmserver/src/mock_session_manager_service.cpp | 2 +- 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dm/include/display_manager_adapter.h b/dm/include/display_manager_adapter.h index ed01fcdd4d..63b99f7ca0 100644 --- a/dm/include/display_manager_adapter.h +++ b/dm/include/display_manager_adapter.h @@ -123,7 +123,7 @@ public: virtual DMError DestroyVirtualScreen(ScreenId screenId); virtual DMError SetVirtualScreenSurface(ScreenId screenId, sptr surface); virtual DMError AddVirtualScreenBlackList(const std::vector& persistentIds); - virtual DMError RemoveVirtualScreenBlackList(const std::vector& persistentIds); + virtual DMError RemoveVirtualScreenBlackList(const std::vector& persistentIds); virtual DMError SetScreenPrivacyMaskImage(ScreenId screenId, const std::shared_ptr& privacyMaskImg); virtual DMError SetVirtualMirrorScreenCanvasRotation(ScreenId screenId, bool canvasRotation); diff --git a/dmserver/include/display_manager_interface.h b/dmserver/include/display_manager_interface.h index e850f8357b..f076d4b781 100644 --- a/dmserver/include/display_manager_interface.h +++ b/dmserver/include/display_manager_interface.h @@ -49,8 +49,8 @@ public: const sptr& displayManagerAgent) = 0; virtual DMError DestroyVirtualScreen(ScreenId screenId) = 0; virtual DMError SetVirtualScreenSurface(ScreenId screenId, sptr surface) = 0; - virtual DMError AddVirtualScreenBlackList(const std::vector& persistentIds) { return DMError::DM_OK }; - virtual DMError RemoveVirtualScreenBlackList(const std::vector& persistentIds) { return DMError::DM_OK }; + virtual DMError AddVirtualScreenBlackList(const std::vector& persistentIds) { return DMError::DM_OK; } + virtual DMError RemoveVirtualScreenBlackList(const std::vector& persistentIds) { return DMError::DM_OK; } virtual DMError SetScreenPrivacyMaskImage(ScreenId screenId, const std::shared_ptr& privacyMaskImg) { return DMError::DM_ERROR_DEVICE_NOT_SUPPORT; diff --git a/dmserver/include/display_manager_interface_code.h b/dmserver/include/display_manager_interface_code.h index cf4a5a1d74..61bb3dfde5 100644 --- a/dmserver/include/display_manager_interface_code.h +++ b/dmserver/include/display_manager_interface_code.h @@ -46,7 +46,7 @@ enum class DisplayManagerMessage : unsigned int { TRANS_ID_CREATE_VIRTUAL_SCREEN = TRANS_ID_SCREEN_BASE, TRANS_ID_DESTROY_VIRTUAL_SCREEN, TRANS_ID_SET_VIRTUAL_SCREEN_SURFACE, - TRANS_ID_ADD_VIRTUAL_SCREEN_BLCAK_LIST, + TRANS_ID_ADD_VIRTUAL_SCREEN_BLACK_LIST, TRANS_ID_REMOVE_VIRTUAL_SCREEN_BLACK_LIST, TRANS_ID_SET_VIRTUAL_SCREEN_CANVAS_ROTATION, TRANS_ID_GET_SCREEN_INFO_BY_ID, diff --git a/interfaces/kits/napi/display_runtime/js_display_manager.cpp b/interfaces/kits/napi/display_runtime/js_display_manager.cpp index 1e7dc9280a..3b5bbb2dd9 100644 --- a/interfaces/kits/napi/display_runtime/js_display_manager.cpp +++ b/interfaces/kits/napi/display_runtime/js_display_manager.cpp @@ -1149,7 +1149,7 @@ napi_value OnAddVirtualScreenBlackList(napi_env env, napi_callback_info info) napi_value argv[ARGC_THREE] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc < ARGC_ONE) { - TLOGD(WmsLogTag::DMS, "[NAPI]Argc is invalid: %{public}zu", argc); + TLOGE(WmsLogTag::DMS, "[NAPI]Argc is invalid: %{public}zu", argc); return NapiThrowError( env, DmErrorCode::DM_ERROR_INVALID_PARAM, "Invalid parameter count"); } @@ -1200,7 +1200,7 @@ napi_value OnRemoveVirtualScreenBlackList(napi_env env, napi_callback_info info) napi_value argv[ARGC_THREE] = {nullptr}; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc < ARGC_ONE) { - TLOGD(WmsLogTag::DMS, "[NAPI]Argc is invalid: %{public}zu", argc); + TLOGE(WmsLogTag::DMS, "[NAPI]Argc is invalid: %{public}zu", argc); return NapiThrowError( env, DmErrorCode::DM_ERROR_INVALID_PARAM, "Invalid parameter count"); } diff --git a/window_scene/screen_session_manager/src/zidl/screen_session_manager_proxy.cpp b/window_scene/screen_session_manager/src/zidl/screen_session_manager_proxy.cpp index 9a4d7f0500..d049ad0b67 100644 --- a/window_scene/screen_session_manager/src/zidl/screen_session_manager_proxy.cpp +++ b/window_scene/screen_session_manager/src/zidl/screen_session_manager_proxy.cpp @@ -1190,7 +1190,7 @@ DMError ScreenSessionManagerProxy::AddVirtualScreenBlackList(const std::vectorSendRequest( - static_cast(DisplayManagerMessage::TRANS_ID_ADD_VIRTUAL_SCREEN_BLCAK_LIST), + static_cast(DisplayManagerMessage::TRANS_ID_ADD_VIRTUAL_SCREEN_BLACK_LIST), data, reply, option) != ERR_NONE) { TLOGE(WmsLogTag::DMS, "SendRequest failed"); return DMError::DM_ERROR_IPC_FAILED; @@ -1224,7 +1224,7 @@ DMError ScreenSessionManagerProxy::RemoveVirtualScreenBlackList(const std::vecto } } for (remote->SendRequest( - static_cast(DisplayManagerMessage::TRANS_ID_ADD_VIRTUAL_SCREEN_BLCAK_LIST), + static_cast(DisplayManagerMessage::TRANS_ID_REMOVE_VIRTUAL_SCREEN_BLACK_LIST), data, reply, option) != ERR_NONE) { TLOGE(WmsLogTag::DMS, "SendRequest failed"); return DMError::DM_ERROR_IPC_FAILED; diff --git a/window_scene/screen_session_manager/src/zidl/screen_session_manager_stub.cpp b/window_scene/screen_session_manager/src/zidl/screen_session_manager_stub.cpp index 1bf76e6450..a63aeaa452 100644 --- a/window_scene/screen_session_manager/src/zidl/screen_session_manager_stub.cpp +++ b/window_scene/screen_session_manager/src/zidl/screen_session_manager_stub.cpp @@ -282,7 +282,7 @@ int32_t ScreenSessionManagerStub::OnRemoteRequest(uint32_t code, MessageParcel& } persistentIds.push_back(persistentId); } - DMError errCode = AddVirtualScreenBlackList(persistentIds); + DMError errCode = RemoveVirtualScreenBlackList(persistentIds); reply.WriteInt32(static_cast(errCode)); break; } diff --git a/window_scene/session_manager/include/zidl/scene_session_manager_interface.h b/window_scene/session_manager/include/zidl/scene_session_manager_interface.h index 19f1c1cad2..4c0632ee20 100644 --- a/window_scene/session_manager/include/zidl/scene_session_manager_interface.h +++ b/window_scene/session_manager/include/zidl/scene_session_manager_interface.h @@ -363,10 +363,14 @@ public: bool isRelease) override { return WMError::WM_OK; } virtual WMError AddSkipSelfWhenShowOnVirtualScreenList(const std::vector& persistentIds) - { return WMError::WM_OK; } + { + return WMError::WM_OK; + } virtual WMError RemoveSkipSelfWhenShowOnVirtualScreenList(const std::vector& persistentIds) - { return WMError::WM_OK; } + { + return WMError::WM_OK; + } WMError IsPcOrPadFreeMultiWindowMode(bool& isPcOrPadFreeMultiWindowMode) override { return WMError::WM_OK; } diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index c845414d56..2aa320a578 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -1754,7 +1754,7 @@ WMError SceneSessionManager::RemoveSkipSelfWhenShowOnVirtualScreenList(const std if (!session) { continue; } - TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] remove to virtual screen black list", persistentId); + TLOGNI(WmsLogTag::WMS_ATTRIBUTE, "[win: %{public}d] remove from virtual screen black list", persistentId); auto surfaceNode = session->GetSurfaceNode(); if (surfaceNode) { auto surfaceNodeId = surfaceNode->GetId(); diff --git a/wmserver/src/mock_session_manager_service.cpp b/wmserver/src/mock_session_manager_service.cpp index b04615da22..b440aa18cf 100644 --- a/wmserver/src/mock_session_manager_service.cpp +++ b/wmserver/src/mock_session_manager_service.cpp @@ -828,7 +828,7 @@ void MockSessionManagerService::RemoveSkipSelfWhenShowOnVirtualScreenList(const sptr sceneSessionManagerProxy = iface_cast(sceneSessionManager_); WMError ret = sceneSessionManagerProxy->RemoveSkipSelfWhenShowOnVirtualScreenList(persistentIds); if (ret != WMError::WM_OK) { - TLOGE(WmsLogTag::WMS_ATTRIBUTE, "add virtual screen black list failed!"); + TLOGE(WmsLogTag::WMS_ATTRIBUTE, "remove virtual screen black list failed!"); } }