diff --git a/services/BUILD.gn b/services/BUILD.gn index d0d47a4aaed1f4a0bde241947eadc9251de41bd0..6d8bd25b3eb1d862800f41035abeeb16c85de3a4 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -127,7 +127,7 @@ ohos_shared_library("inputmethod_service") { "resource_schedule_service:ressched_client", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "window_manager:libdm", + "window_manager:libdm_lite", "window_manager:libwsutils", ] @@ -233,6 +233,7 @@ ohos_static_library("inputmethod_service_static") { "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libwsutils", + "window_manager:libdm_lite", ] defines = [] diff --git a/services/src/input_method_system_ability.cpp b/services/src/input_method_system_ability.cpp index 10f15c0d17b987a521d37f34d38ecc6bf16d1230..566963dcf4e8827383368601a3df4775be0f5c6c 100644 --- a/services/src/input_method_system_ability.cpp +++ b/services/src/input_method_system_ability.cpp @@ -41,7 +41,8 @@ #include "on_demand_start_stop_sa.h" #endif #include "window_adapter.h" -#include "display_manager.h" +#include "display_manager_lite.h" +#include "display_info.h" #include "input_method_tools.h" namespace OHOS { @@ -720,8 +721,14 @@ void InputMethodSystemAbility::ChangeToDefaultImeForHiCar(int32_t userId, InputC return; } auto callingWindowInfo = session->GetCallingWindowInfo(inputClientInfo); - sptr displayInfo = nullptr; - displayInfo = Rosen::DisplayManager::GetInstance().GetDisplayById(callingWindowInfo.displayId); + sptr display = nullptr; + display = Rosen::DisplayManagerLite::GetInstance().GetDisplayById(callingWindowInfo.displayId); + if (display == nullptr) { + IMSA_HILOGE("display is null!"); + return; + } + sptr displayInfo = nullptr; + displayInfo = display->GetDisplayInfo(); if (displayInfo == nullptr) { IMSA_HILOGE("displayInfo is null!"); return; diff --git a/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn b/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn index d51e573baa9d7e407c52b20f14563c105f57b7de..0a94cc191654c06fa820fd52a30a72f946460708 100644 --- a/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn +++ b/test/fuzztest/inputmethodsystemability_fuzzer/BUILD.gn @@ -62,7 +62,7 @@ ohos_fuzztest("InputmethodSystemAbilityFuzzTest") { "input:libmmi-client", "ipc:ipc_single", "safwk:system_ability_fwk", - "window_manager:libdm", + "window_manager:libdm_lite", ] } diff --git a/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn b/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn index 6a22ebf20b0b32624a78e15d25fcf003f892d019..8ad0648c8746d32dedc133cb9d445fa540b272d6 100644 --- a/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn +++ b/test/fuzztest/systemabilitystub_fuzzer/BUILD.gn @@ -62,7 +62,7 @@ ohos_fuzztest("SystemAbilityStubFuzzTest") { "input:libmmi-client", "ipc:ipc_single", "safwk:system_ability_fwk", - "window_manager:libdm", + "window_manager:libdm_lite", ] } diff --git a/test/fuzztest/systemabilitystubfuzztest/BUILD.gn b/test/fuzztest/systemabilitystubfuzztest/BUILD.gn index 6808f3cc13a9dde702767f1d72eea7d0a1654fe9..98cf74a39247ff541f0b9c19ac8df1672e63a525 100644 --- a/test/fuzztest/systemabilitystubfuzztest/BUILD.gn +++ b/test/fuzztest/systemabilitystubfuzztest/BUILD.gn @@ -66,7 +66,7 @@ common_external_deps = [ "hilog:libhilog", "input:libmmi-client", "safwk:system_ability_fwk", - "window_manager:libdm", + "window_manager:libdm_lite", ] common_deps = [ diff --git a/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn b/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn index d65aca8e9f4a186ec72514b76655d1bf29c4963e..30e195577e347175576fe6413a930f7149292cfc 100644 --- a/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn +++ b/test/fuzztest/systemabilitystubfuzztest/common/BUILD.gn @@ -64,7 +64,7 @@ ohos_static_library("imf_sa_stub_fuzztest_common_static") { "input:libmmi-client", "ipc:ipc_single", "safwk:system_ability_fwk", - "window_manager:libdm", + "window_manager:libdm_lite", ] subsystem_name = "inputmethod" diff --git a/test/unittest/cpp_test/BUILD.gn b/test/unittest/cpp_test/BUILD.gn index e64f0e6ea9869f75cd0c3a1265420e54c57000c2..315a6d6153472db6e3e2bfef4de5e4a794832a80 100644 --- a/test/unittest/cpp_test/BUILD.gn +++ b/test/unittest/cpp_test/BUILD.gn @@ -990,7 +990,7 @@ ohos_unittest("SecurityModeParseTest") { "ipc:ipc_single", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "window_manager:libdm", + "window_manager:libdm_lite", ] } diff --git a/test/unittest/cpp_test/common/BUILD.gn b/test/unittest/cpp_test/common/BUILD.gn index fa778fa164ce5e1f88a54d3eb858b41700048be2..44d6204cd277827c22b9e9425294164ca1c866ae 100644 --- a/test/unittest/cpp_test/common/BUILD.gn +++ b/test/unittest/cpp_test/common/BUILD.gn @@ -70,7 +70,7 @@ ohos_static_library("inputmethod_tdd_util") { "os_account:os_account_innerkits", "safwk:system_ability_fwk", "samgr:samgr_proxy", - "window_manager:libdm", + "window_manager:libdm_lite", "window_manager:libwsutils", ]