diff --git a/service/BUILD.gn b/service/BUILD.gn index f93b382bfa14c3955fc14fa7f65748e4687abf35..6222545f84ab3df2ba3df419200d20cf254dede1 100644 --- a/service/BUILD.gn +++ b/service/BUILD.gn @@ -228,7 +228,7 @@ ohos_shared_library("libmmi-server") { external_deps = [ "c_utils:utils" ] if (input_feature_pointer_drawing) { - external_deps += [ "window_manager:libwm" ] + external_deps += [ "window_manager:libwm_lite" ] } if (input_ext_feature_magiccursor) { @@ -277,7 +277,7 @@ ohos_shared_library("libmmi-server") { "preferences:native_preferences", "relational_store:native_rdb", "safwk:system_ability_fwk", - "window_manager:libwm", + "window_manager:libwm_lite", "window_manager:libwsutils", ] diff --git a/service/event_handler/src/anr_manager.cpp b/service/event_handler/src/anr_manager.cpp index 70d1f2916b9e882d1c2c804511019732c63bec19..a9b5d1801119fd1ef09923c36859617532a12e15 100644 --- a/service/event_handler/src/anr_manager.cpp +++ b/service/event_handler/src/anr_manager.cpp @@ -24,7 +24,6 @@ #include "napi_constants.h" #include "proto.h" #include "timer_manager.h" -#include "window_manager.h" #undef MMI_LOG_TAG #define MMI_LOG_TAG "ANRManager" diff --git a/service/module_loader/src/uds_server.cpp b/service/module_loader/src/uds_server.cpp index 539faccda977a1fdda3e34558fae0a6bf9f53c74..705ba77dee9bfe94d11ed88efffbff0761de1c89 100644 --- a/service/module_loader/src/uds_server.cpp +++ b/service/module_loader/src/uds_server.cpp @@ -146,17 +146,18 @@ int32_t UDSServer::AddSocketPairInfo(const std::string& programName, int32_t UDSServer::SetFdProperty(int32_t& tokenType, int32_t& serverFd, int32_t& toReturnClientFd) { static size_t bufferSize = 64 * 1024; + static size_t serverBufferSize = 64 * 1024; static size_t nativeBufferSize = 128 * 1024; #ifdef OHOS_BUILD_ENABLE_ANCO bufferSize = 512 * 1024; nativeBufferSize = 1024 * 1024; #endif // OHOS_BUILD_ENABLE_ANCO - if (setsockopt(serverFd, SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)) != 0) { + if (setsockopt(serverFd, SOL_SOCKET, SO_SNDBUF, &serverBufferSize, sizeof(bufferSize)) != 0) { MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno); return RET_ERR; } - if (setsockopt(serverFd, SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)) != 0) { + if (setsockopt(serverFd, SOL_SOCKET, SO_RCVBUF, &serverBufferSize, sizeof(bufferSize)) != 0) { MMI_HILOGE("setsockopt serverFd failed, errno: %{public}d", errno); return RET_ERR; } diff --git a/service/window_manager/include/input_windows_manager.h b/service/window_manager/include/input_windows_manager.h index 668cb891de5000cc1922b01994563fe9c9ec61e9..3ad71470c209afe6602d81b885cd4a6bc382a2c1 100644 --- a/service/window_manager/include/input_windows_manager.h +++ b/service/window_manager/include/input_windows_manager.h @@ -32,7 +32,7 @@ #include "pointer_event.h" #include "pointer_style.h" #include "window_info.h" -#include "window_manager.h" +#include "window_manager_lite.h" #include "uds_server.h" namespace OHOS { diff --git a/service/window_manager/src/input_windows_manager.cpp b/service/window_manager/src/input_windows_manager.cpp index 4255217f15620ac796af7a7ed2dfe86c804c35c9..38c76e2c8b48978ef2b8262c56d1b97713e43e62 100644 --- a/service/window_manager/src/input_windows_manager.cpp +++ b/service/window_manager/src/input_windows_manager.cpp @@ -2707,7 +2707,7 @@ bool InputWindowsManager::IsWindowVisible(int32_t pid) return true; } std::vector> infos; - Rosen::WindowManager::GetInstance().GetVisibilityWindowInfo(infos); + Rosen::WindowManagerLite::GetInstance().GetVisibilityWindowInfo(infos); for (const auto &it: infos) { if (pid == it->pid_ && it->visibilityState_ < Rosen::WindowVisibilityState::WINDOW_VISIBILITY_STATE_TOTALLY_OCCUSION) {