openharmony/window_window_manager
1
0
Fork 0
mirror of https://github.com/openharmony/window_window_manager.git synced 2026-08-25 00:03:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: typos

Browse Source 
Signed-off-by: ReCoder <jianhao2@h-partners.com>
This commit is contained in:
ReCoder
2025-03-27 10:38:34 +08:00
parent 7636b7f620
commit 1559fbb5a7
9 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dm/include/display_manager_adapter.h
+1 -1
View File
@@ -123,7 +123,7 @@ public:
virtual DMError DestroyVirtualScreen(ScreenId screenId);
virtual DMError SetVirtualScreenSurface(ScreenId screenId, sptr<Surface> surface);
virtual DMError AddVirtualScreenBlackList(const std::vector<int32_t>& persistentIds);
virtual DMError RemoveVirtualScreenBlackList(const std::vector<int32_T>& persistentIds);
virtual DMError RemoveVirtualScreenBlackList(const std::vector<int32_t>& persistentIds);
virtual DMError SetScreenPrivacyMaskImage(ScreenId screenId,
const std::shared_ptr<Media::PixelMap>& privacyMaskImg);
virtual DMError SetVirtualMirrorScreenCanvasRotation(ScreenId screenId, bool canvasRotation);
dmserver/include/display_manager_interface.h
+2 -2
View File
@@ -49,8 +49,8 @@ public:
const sptr<IRemoteObject>& displayManagerAgent) = 0;
virtual DMError DestroyVirtualScreen(ScreenId screenId) = 0;
virtual DMError SetVirtualScreenSurface(ScreenId screenId, sptr<IBufferProducer> surface) = 0;
virtual DMError AddVirtualScreenBlackList(const std::vector<int32_t>& persistentIds) { return DMError::DM_OK };
virtual DMError RemoveVirtualScreenBlackList(const std::vector<int32_t>& persistentIds) { return DMError::DM_OK };
virtual DMError AddVirtualScreenBlackList(const std::vector<int32_t>& persistentIds) { return DMError::DM_OK; }
virtual DMError RemoveVirtualScreenBlackList(const std::vector<int32_t>& persistentIds) { return DMError::DM_OK; }
virtual DMError SetScreenPrivacyMaskImage(ScreenId screenId, const std::shared_ptr<Media::PixelMap>& privacyMaskImg)
{
return DMError::DM_ERROR_DEVICE_NOT_SUPPORT;
dmserver/include/display_manager_interface_code.h
+1 -1
View File
@@ -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,
interfaces/kits/napi/display_runtime/js_display_manager.cpp
+2 -2
View File
@@ -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");
}
window_scene/screen_session_manager/src/zidl/screen_session_manager_proxy.cpp
+2 -2
View File
@@ -1190,7 +1190,7 @@ DMError ScreenSessionManagerProxy::AddVirtualScreenBlackList(const std::vector<i
}
}
for (remote->SendRequest(
static_cast<uint32_t>(DisplayManagerMessage::TRANS_ID_ADD_VIRTUAL_SCREEN_BLCAK_LIST),
static_cast<uint32_t>(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<uint32_t>(DisplayManagerMessage::TRANS_ID_ADD_VIRTUAL_SCREEN_BLCAK_LIST),
static_cast<uint32_t>(DisplayManagerMessage::TRANS_ID_REMOVE_VIRTUAL_SCREEN_BLACK_LIST),
data, reply, option) != ERR_NONE) {
TLOGE(WmsLogTag::DMS, "SendRequest failed");
return DMError::DM_ERROR_IPC_FAILED;
window_scene/screen_session_manager/src/zidl/screen_session_manager_stub.cpp
+1 -1
View File
@@ -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<int32_t>(errCode));
break;
}
window_scene/session_manager/include/zidl/scene_session_manager_interface.h
+6 -2
View File
@@ -363,10 +363,14 @@ public:
bool isRelease) override { return WMError::WM_OK; }
virtual WMError AddSkipSelfWhenShowOnVirtualScreenList(const std::vector<int32_t>& persistentIds)
{ return WMError::WM_OK; }
{
return WMError::WM_OK;
}
virtual WMError RemoveSkipSelfWhenShowOnVirtualScreenList(const std::vector<int32_t>& persistentIds)
{ return WMError::WM_OK; }
{
return WMError::WM_OK;
}
WMError IsPcOrPadFreeMultiWindowMode(bool& isPcOrPadFreeMultiWindowMode) override { return WMError::WM_OK; }
window_scene/session_manager/src/scene_session_manager.cpp
+1 -1
View File
@@ -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();
wmserver/src/mock_session_manager_service.cpp
+1 -1
View File
@@ -828,7 +828,7 @@ void MockSessionManagerService::RemoveSkipSelfWhenShowOnVirtualScreenList(const
sptr<ISceneSessionManager> sceneSessionManagerProxy = iface_cast<ISceneSessionManager>(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!");
}
}