From 366084b85d511f5c3bfb33852f9b848001ba50f9 Mon Sep 17 00:00:00 2001 From: yuanhao Date: Mon, 14 Apr 2025 10:53:08 +0800 Subject: [PATCH] =?UTF-8?q?use=20dmlite=20installed=20of=20dm=20Signed-off?= =?UTF-8?q?-by:=20=E8=A2=81=E6=B5=A9=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/BUILD.gn | 3 ++- services/src/input_method_system_ability.cpp | 13 ++++++++++--- .../inputmethodsystemability_fuzzer/BUILD.gn | 2 +- test/fuzztest/systemabilitystub_fuzzer/BUILD.gn | 2 +- test/fuzztest/systemabilitystubfuzztest/BUILD.gn | 2 +- .../systemabilitystubfuzztest/common/BUILD.gn | 2 +- test/unittest/cpp_test/BUILD.gn | 2 +- test/unittest/cpp_test/common/BUILD.gn | 2 +- 8 files changed, 18 insertions(+), 10 deletions(-) diff --git a/services/BUILD.gn b/services/BUILD.gn index d0d47a4aa..6d8bd25b3 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 10f15c0d1..566963dcf 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 d51e573ba..0a94cc191 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 6a22ebf20..8ad0648c8 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 6808f3cc1..98cf74a39 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 d65aca8e9..30e195577 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 e64f0e6ea..315a6d615 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 fa778fa16..44d6204cd 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", ] -- Gitee