From a633b9aa988956470d11f91953f53257dab4fa54 Mon Sep 17 00:00:00 2001 From: zhuzhihui7 Date: Thu, 10 Apr 2025 16:43:43 +0800 Subject: [PATCH] Issue:https://gitee.com/openharmony/inputmethod_imf/issues/IC03MU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Desc:适配systemabilitymgr_safwk仓删除all_deps_config Signed-off-by: zhuzhihui7 --- frameworks/native/inputmethod_ability/IInputMethodAgent.idl | 2 +- frameworks/native/inputmethod_ability/IInputMethodCore.idl | 2 +- .../native/inputmethod_controller/IInputDataChannel.idl | 2 +- .../native/inputmethod_controller/IKeyEventConsumer.idl | 2 +- .../native/inputmethod_controller/ISystemCmdChannel.idl | 2 +- interfaces/inner_api/inputmethod_ability/BUILD.gn | 2 ++ interfaces/inner_api/inputmethod_controller/BUILD.gn | 2 ++ test/fuzztest/controlchannelstub_fuzzer/BUILD.gn | 1 + test/fuzztest/corestub_fuzzer/BUILD.gn | 1 + test/fuzztest/datachannelstub_fuzzer/BUILD.gn | 1 + test/fuzztest/imesystemchannel_fuzzer/BUILD.gn | 1 + test/fuzztest/perusersession_fuzzer/BUILD.gn | 1 + test/fuzztest/systemcmdchannelstub_fuzzer/BUILD.gn | 1 + test/unittest/cpp_test/BUILD.gn | 5 +++++ 14 files changed, 20 insertions(+), 5 deletions(-) diff --git a/frameworks/native/inputmethod_ability/IInputMethodAgent.idl b/frameworks/native/inputmethod_ability/IInputMethodAgent.idl index 6c2bb43be..30b2d4d6a 100644 --- a/frameworks/native/inputmethod_ability/IInputMethodAgent.idl +++ b/frameworks/native/inputmethod_ability/IInputMethodAgent.idl @@ -19,7 +19,7 @@ sequenceable input_method_utils..OHOS.MiscServices.KeyEventValue; sequenceable input_method_utils..OHOS.MiscServices.ArrayBuffer; interface OHOS.MiscServices.IKeyEventConsumer; interface OHOS.MiscServices.IInputMethodAgent { - void DispatchKeyEvent([in] KeyEventValue keyEvent, [in] IKeyEventConsumer consumer); + [ipccode 0] void DispatchKeyEvent([in] KeyEventValue keyEvent, [in] IKeyEventConsumer consumer); void OnCursorUpdate([in] int positionX, [in] int positionY, [in] int height); void OnSelectionChange([in] String text, [in] int oldBegin, [in] int oldEnd, [in] int newBegin, [in] int newEnd); void SetCallingWindow([in] unsigned int windowId); diff --git a/frameworks/native/inputmethod_ability/IInputMethodCore.idl b/frameworks/native/inputmethod_ability/IInputMethodCore.idl index ba57b80a1..4f4b716ea 100644 --- a/frameworks/native/inputmethod_ability/IInputMethodCore.idl +++ b/frameworks/native/inputmethod_ability/IInputMethodCore.idl @@ -20,7 +20,7 @@ sequenceable panel_info..OHOS.MiscServices.PanelInfo; sequenceable OHOS.IRemoteObject; interface OHOS.MiscServices.IInputControlChannel; interface OHOS.MiscServices.IInputMethodCore { - void StartInput([in] InputClientInfoInner clientInfoInner, [in] boolean isBindFromClient); + [ipccode 0] void StartInput([in] InputClientInfoInner clientInfoInner, [in] boolean isBindFromClient); void StopInput([in] IRemoteObject channel, [in] unsigned int sessionId); void ShowKeyboard(); void HideKeyboard(); diff --git a/frameworks/native/inputmethod_controller/IInputDataChannel.idl b/frameworks/native/inputmethod_controller/IInputDataChannel.idl index b2edb1e58..b798d6359 100644 --- a/frameworks/native/inputmethod_controller/IInputDataChannel.idl +++ b/frameworks/native/inputmethod_controller/IInputDataChannel.idl @@ -21,7 +21,7 @@ sequenceable input_method_utils..OHOS.MiscServices.Value; sequenceable input_method_utils..OHOS.MiscServices.RangeInner; sequenceable input_method_utils..OHOS.MiscServices.ArrayBuffer; interface OHOS.MiscServices.IInputDataChannel { - void InsertText([in] String text); + [ipccode 0] void InsertText([in] String text); void DeleteForward([in] int length); void DeleteBackward([in] int length); void GetTextBeforeCursor([in] int number, [out] String text); diff --git a/frameworks/native/inputmethod_controller/IKeyEventConsumer.idl b/frameworks/native/inputmethod_controller/IKeyEventConsumer.idl index 1af63df2f..f96ffbc3c 100644 --- a/frameworks/native/inputmethod_controller/IKeyEventConsumer.idl +++ b/frameworks/native/inputmethod_controller/IKeyEventConsumer.idl @@ -14,5 +14,5 @@ */ interface OHOS.MiscServices.IKeyEventConsumer { - [oneway] void OnKeyEventResult([in] boolean isConsumed); + [ipccode 0, oneway] void OnKeyEventResult([in] boolean isConsumed); } \ No newline at end of file diff --git a/frameworks/native/inputmethod_controller/ISystemCmdChannel.idl b/frameworks/native/inputmethod_controller/ISystemCmdChannel.idl index e3496b88d..0adbb3948 100644 --- a/frameworks/native/inputmethod_controller/ISystemCmdChannel.idl +++ b/frameworks/native/inputmethod_controller/ISystemCmdChannel.idl @@ -16,6 +16,6 @@ sequenceable input_method_utils..OHOS.MiscServices.Value; sequenceable sys_panel_status..OHOS.MiscServices.SysPanelStatus; interface OHOS.MiscServices.ISystemCmdChannel { - [oneway] void SendPrivateCommand([in] Value value); + [ipccode 0, oneway] void SendPrivateCommand([in] Value value); [oneway] void NotifyPanelStatus([in] SysPanelStatus sysPanelStatus); } diff --git a/interfaces/inner_api/inputmethod_ability/BUILD.gn b/interfaces/inner_api/inputmethod_ability/BUILD.gn index fd0cfea38..5c4e7262a 100644 --- a/interfaces/inner_api/inputmethod_ability/BUILD.gn +++ b/interfaces/inner_api/inputmethod_ability/BUILD.gn @@ -350,6 +350,7 @@ ohos_shared_library("inputmethod_ability") { "input:libmmi-client", "ipc:ipc_single", "napi:ace_napi", + "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwsutils", @@ -471,6 +472,7 @@ ohos_static_library("inputmethod_ability_static") { "input:libmmi-client", "ipc:ipc_single", "napi:ace_napi", + "safwk:system_ability_fwk", "samgr:samgr_proxy", "window_manager:libdm", "window_manager:libwsutils", diff --git a/interfaces/inner_api/inputmethod_controller/BUILD.gn b/interfaces/inner_api/inputmethod_controller/BUILD.gn index be9489c1b..d63bff863 100644 --- a/interfaces/inner_api/inputmethod_controller/BUILD.gn +++ b/interfaces/inner_api/inputmethod_controller/BUILD.gn @@ -221,6 +221,7 @@ ohos_shared_library("inputmethod_client") { "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] public_external_deps = [ "ability_base:want" ] @@ -292,6 +293,7 @@ ohos_static_library("inputmethod_client_static") { "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", + "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/test/fuzztest/controlchannelstub_fuzzer/BUILD.gn b/test/fuzztest/controlchannelstub_fuzzer/BUILD.gn index 096969e14..0ee0423fd 100644 --- a/test/fuzztest/controlchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/controlchannelstub_fuzzer/BUILD.gn @@ -46,6 +46,7 @@ ohos_fuzztest("ControlChannelStubFuzzTest") { "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", + "safwk:system_ability_fwk", ] } diff --git a/test/fuzztest/corestub_fuzzer/BUILD.gn b/test/fuzztest/corestub_fuzzer/BUILD.gn index 26c46066f..4dad8b65a 100644 --- a/test/fuzztest/corestub_fuzzer/BUILD.gn +++ b/test/fuzztest/corestub_fuzzer/BUILD.gn @@ -47,6 +47,7 @@ ohos_fuzztest("CoreStubFuzzTest") { "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", + "safwk:system_ability_fwk", ] } diff --git a/test/fuzztest/datachannelstub_fuzzer/BUILD.gn b/test/fuzztest/datachannelstub_fuzzer/BUILD.gn index 210d3c3c0..e7f64845e 100644 --- a/test/fuzztest/datachannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/datachannelstub_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("DataChannelStubFuzzTest") { "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", + "safwk:system_ability_fwk", ] } diff --git a/test/fuzztest/imesystemchannel_fuzzer/BUILD.gn b/test/fuzztest/imesystemchannel_fuzzer/BUILD.gn index 3ffb9b263..b492f1d8e 100644 --- a/test/fuzztest/imesystemchannel_fuzzer/BUILD.gn +++ b/test/fuzztest/imesystemchannel_fuzzer/BUILD.gn @@ -47,6 +47,7 @@ ohos_fuzztest("ImeSystemChannelFuzzTest") { "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", + "safwk:system_ability_fwk", ] } diff --git a/test/fuzztest/perusersession_fuzzer/BUILD.gn b/test/fuzztest/perusersession_fuzzer/BUILD.gn index 870539a7c..581e59283 100644 --- a/test/fuzztest/perusersession_fuzzer/BUILD.gn +++ b/test/fuzztest/perusersession_fuzzer/BUILD.gn @@ -59,6 +59,7 @@ ohos_fuzztest("PerUserSessionFuzzTest") { "input:libmmi-client", "ipc:ipc_single", "napi:ace_napi", + "safwk:system_ability_fwk", "window_manager:libdm", ] diff --git a/test/fuzztest/systemcmdchannelstub_fuzzer/BUILD.gn b/test/fuzztest/systemcmdchannelstub_fuzzer/BUILD.gn index 9c03fd2f2..2e43cee8c 100644 --- a/test/fuzztest/systemcmdchannelstub_fuzzer/BUILD.gn +++ b/test/fuzztest/systemcmdchannelstub_fuzzer/BUILD.gn @@ -50,6 +50,7 @@ ohos_fuzztest("SystemCmdChannelStubFuzzTest") { "hilog:libhilog", "input:libmmi-client", "ipc:ipc_single", + "safwk:system_ability_fwk", ] } diff --git a/test/unittest/cpp_test/BUILD.gn b/test/unittest/cpp_test/BUILD.gn index e64f0e6ea..1c177c945 100644 --- a/test/unittest/cpp_test/BUILD.gn +++ b/test/unittest/cpp_test/BUILD.gn @@ -488,6 +488,7 @@ ohos_unittest("InputMethodSwitchTest") { "data_share:datashare_consumer", "hilog:libhilog", "input:libmmi-client", + "safwk:system_ability_fwk", ] if (window_manager_use_sceneboard) { @@ -546,6 +547,7 @@ ohos_unittest("ITypesUtilTest") { "input:libmmi-client", "ipc:ipc_single", "napi:ace_napi", + "safwk:system_ability_fwk", "window_manager:libwm_lite", ] } @@ -718,6 +720,7 @@ ohos_unittest("NewImeSwitchTest") { "data_share:datashare_consumer", "hilog:libhilog", "input:libmmi-client", + "safwk:system_ability_fwk", ] if (window_manager_use_sceneboard) { @@ -880,6 +883,7 @@ ohos_unittest("ImeProxyTest") { "input:libmmi-client", "ipc:ipc_single", "napi:ace_napi", + "safwk:system_ability_fwk", "window_manager:libdm", ] @@ -1065,6 +1069,7 @@ ohos_unittest("ImeFreezeManagerTest") { "ipc:ipc_single", "napi:ace_napi", "os_account:os_account_innerkits", + "safwk:system_ability_fwk", ] if (window_manager_use_sceneboard) { -- Gitee