diff --git a/test/fuzztest/cleanwindowstyle_fuzzer/BUILD.gn b/test/fuzztest/cleanwindowstyle_fuzzer/BUILD.gn index 606856bdd83710ffdbd53accc442a87249d7d415..1e3252ad0ff1580b3812f5fe5722c7c464a21322 100644 --- a/test/fuzztest/cleanwindowstyle_fuzzer/BUILD.gn +++ b/test/fuzztest/cleanwindowstyle_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("CleanWindowStyleFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "cleanwindowstyle_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/cleanwindowstyle_fuzzer/cleanwindowstyle_fuzzer.cpp b/test/fuzztest/cleanwindowstyle_fuzzer/cleanwindowstyle_fuzzer.cpp index 0d6fdd495b7d720e9d35d8c46e9a657d998aaf25..c6d07985e0ab30a274d10372839ad14443151deb 100644 --- a/test/fuzztest/cleanwindowstyle_fuzzer/cleanwindowstyle_fuzzer.cpp +++ b/test/fuzztest/cleanwindowstyle_fuzzer/cleanwindowstyle_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool CleanWindowStyleFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,8 @@ bool CleanWindowStyleFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::CLEAN_WIDNOW_STYLE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_CLEAR_WINDOW_POINTER_STYLE), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/enablecombinekey_fuzzer/BUILD.gn b/test/fuzztest/enablecombinekey_fuzzer/BUILD.gn index e4eae3bb22e03917169d1554649b9a553b190b76..f6b69914a9ac2810b01139847946ace7bc6ad14b 100644 --- a/test/fuzztest/enablecombinekey_fuzzer/BUILD.gn +++ b/test/fuzztest/enablecombinekey_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("EnableCombineKeyFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "enablecombinekey_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/enablecombinekey_fuzzer/enablecombinekey_fuzzer.cpp b/test/fuzztest/enablecombinekey_fuzzer/enablecombinekey_fuzzer.cpp index ad3a63a9695fa6839a01139a716c76e2e1dc8624..5e7d3ea977ffecf5aa1d7ee3d77401dc8dc20dd6 100644 --- a/test/fuzztest/enablecombinekey_fuzzer/enablecombinekey_fuzzer.cpp +++ b/test/fuzztest/enablecombinekey_fuzzer/enablecombinekey_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool EnableCombineKeyFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool EnableCombineKeyFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::ENABLE_COMBINE_KEY), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ENABLE_COMBINE_KEY), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/getallnapstatusdata_fuzzer/BUILD.gn b/test/fuzztest/getallnapstatusdata_fuzzer/BUILD.gn index 3849a2eaac6bad1bac87995b65cd1812ceaab20c..7662814813704b68b9e5b66d2d4ef1d942988fe4 100644 --- a/test/fuzztest/getallnapstatusdata_fuzzer/BUILD.gn +++ b/test/fuzztest/getallnapstatusdata_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("GetAllNapstatusDataFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "getallnapstatusdata_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/getallnapstatusdata_fuzzer/getallnapstatusdata_fuzzer.cpp b/test/fuzztest/getallnapstatusdata_fuzzer/getallnapstatusdata_fuzzer.cpp index 494d5217b897939854aa5b114a84b1bc313a316f..a05d33dc7af7f3a5d998d8dbff1c1f20efbfa052 100644 --- a/test/fuzztest/getallnapstatusdata_fuzzer/getallnapstatusdata_fuzzer.cpp +++ b/test/fuzztest/getallnapstatusdata_fuzzer/getallnapstatusdata_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool GetAllNapstatusDataFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,8 @@ bool GetAllNapstatusDataFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_ALL_NAPSTATUS_DATA), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_ALL_MMI_SUBSCRIBED_EVENTS), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/getkeyboardrepeatdelay_fuzzer/BUILD.gn b/test/fuzztest/getkeyboardrepeatdelay_fuzzer/BUILD.gn index a08198922d16b62f08f1341c9b9372ce650c4112..a3d145466c089667c72610e23faa78b018a4c0c4 100644 --- a/test/fuzztest/getkeyboardrepeatdelay_fuzzer/BUILD.gn +++ b/test/fuzztest/getkeyboardrepeatdelay_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("GetKeyBoardRepeatDelayFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "getkeyboardrepeatdelay_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/getkeyboardrepeatdelay_fuzzer/getkeyboardrepeatdelay_fuzzer.cpp b/test/fuzztest/getkeyboardrepeatdelay_fuzzer/getkeyboardrepeatdelay_fuzzer.cpp index 3996b4b5eaf4e5fd781c8357df3454b6a26b30b5..dd127a17acfc729e311e38011340d13a13f42405 100644 --- a/test/fuzztest/getkeyboardrepeatdelay_fuzzer/getkeyboardrepeatdelay_fuzzer.cpp +++ b/test/fuzztest/getkeyboardrepeatdelay_fuzzer/getkeyboardrepeatdelay_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool GetKeyBoardRepeatDelayFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool GetKeyBoardRepeatDelayFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_KEYBOARD_REPEAT_DELAY), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_KEYBOARD_REPEAT_DELAY), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/getkeyboardrepeatrate_fuzzer/BUILD.gn b/test/fuzztest/getkeyboardrepeatrate_fuzzer/BUILD.gn index ef93cb548d41a19cc58209ef3a918d49d34a5b69..5b9caa68189c30f9da41768729f3183c306c0623 100644 --- a/test/fuzztest/getkeyboardrepeatrate_fuzzer/BUILD.gn +++ b/test/fuzztest/getkeyboardrepeatrate_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("GetKeyBoardRepeatRateFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "getkeyboardrepeatrate_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/getkeyboardrepeatrate_fuzzer/getkeyboardrepeatrate_fuzzer.cpp b/test/fuzztest/getkeyboardrepeatrate_fuzzer/getkeyboardrepeatrate_fuzzer.cpp index 8ee3d61277e02b99e9d2afe0f6757295385697f9..f725c7c91fb5acf6b9dc8452f9a9527649721b03 100644 --- a/test/fuzztest/getkeyboardrepeatrate_fuzzer/getkeyboardrepeatrate_fuzzer.cpp +++ b/test/fuzztest/getkeyboardrepeatrate_fuzzer/getkeyboardrepeatrate_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool GetKeyBoardRepeatRateFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool GetKeyBoardRepeatRateFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_KEYBOARD_REPEAT_RATE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_KEYBOARD_REPEAT_RATE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/getpointercolor_fuzzer/BUILD.gn b/test/fuzztest/getpointercolor_fuzzer/BUILD.gn index 64f50a6de98954eef624ae19b4b1247edfc4cb96..ffef016caf1d4f2276e134d4619d615c9748a5d2 100644 --- a/test/fuzztest/getpointercolor_fuzzer/BUILD.gn +++ b/test/fuzztest/getpointercolor_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("GetPointerColorFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "getpointercolor_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/getpointercolor_fuzzer/getpointercolor_fuzzer.cpp b/test/fuzztest/getpointercolor_fuzzer/getpointercolor_fuzzer.cpp index 8a708d8ab9b08a2e2980f9cab49a707512727bba..b48031ef1afd46775281aa05d528bd6536a49af5 100644 --- a/test/fuzztest/getpointercolor_fuzzer/getpointercolor_fuzzer.cpp +++ b/test/fuzztest/getpointercolor_fuzzer/getpointercolor_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool GetPointerColorFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool GetPointerColorFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_POINTER_COLOR), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_POINTER_COLOR), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/getpointersize_fuzzer/BUILD.gn b/test/fuzztest/getpointersize_fuzzer/BUILD.gn index c23640453c9dbdebb4258bb50ff755bfb8c2f37f..60fd8384a8d4cfbe50d0bfa0048fba988762455a 100644 --- a/test/fuzztest/getpointersize_fuzzer/BUILD.gn +++ b/test/fuzztest/getpointersize_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("GetPointerSizeFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "getpointersize_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/getpointersize_fuzzer/getpointersize_fuzzer.cpp b/test/fuzztest/getpointersize_fuzzer/getpointersize_fuzzer.cpp index d69882aa35d966f371917d89fe9a60f4b6ad0200..5b6ff0eb3ffb6b304bff403384547199f6498b7a 100644 --- a/test/fuzztest/getpointersize_fuzzer/getpointersize_fuzzer.cpp +++ b/test/fuzztest/getpointersize_fuzzer/getpointersize_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool GetPointerSizeFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool GetPointerSizeFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_POINTER_SIZE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_POINTER_SIZE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/getshieldstatus_fuzzer/BUILD.gn b/test/fuzztest/getshieldstatus_fuzzer/BUILD.gn index 5d95b67864003601a1536af352eb9784b974fa24..8d4e37d461dd7f0c50efc05462bb7726fc29a054 100644 --- a/test/fuzztest/getshieldstatus_fuzzer/BUILD.gn +++ b/test/fuzztest/getshieldstatus_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("GetShieldStatusFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "getshieldstatus_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/getshieldstatus_fuzzer/getshieldstatus_fuzzer.cpp b/test/fuzztest/getshieldstatus_fuzzer/getshieldstatus_fuzzer.cpp index b34b410f66e7a5446a1c68ca30add2e3e3795d30..cd36a8d8fd4eb1d308a2397adc288e7609a931ef 100644 --- a/test/fuzztest/getshieldstatus_fuzzer/getshieldstatus_fuzzer.cpp +++ b/test/fuzztest/getshieldstatus_fuzzer/getshieldstatus_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool GetShieldStatusFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool GetShieldStatusFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_SHIELD_STATUS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_SHIELD_STATUS), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/gettprightclicktype_fuzzer/BUILD.gn b/test/fuzztest/gettprightclicktype_fuzzer/BUILD.gn index beeb79fa4abc6f1f24d8aadb699dc5c768f4e265..cb4a71b7a5e5f629891fe2905acf63ced2fd33fb 100644 --- a/test/fuzztest/gettprightclicktype_fuzzer/BUILD.gn +++ b/test/fuzztest/gettprightclicktype_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("GetTpRightClickTypeFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "gettprightclicktype_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/gettprightclicktype_fuzzer/gettprightclicktype_fuzzer.cpp b/test/fuzztest/gettprightclicktype_fuzzer/gettprightclicktype_fuzzer.cpp index 22933e304070eae87f618928b772bb3985fb9bdd..489e41179647418c13f6069caf81e4e9ad7284a6 100644 --- a/test/fuzztest/gettprightclicktype_fuzzer/gettprightclicktype_fuzzer.cpp +++ b/test/fuzztest/gettprightclicktype_fuzzer/gettprightclicktype_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool GetTpRightClickTypeFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,8 @@ bool GetTpRightClickTypeFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_TP_RIGHT_CLICK_TYPE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_RIGHT_CLICK_TYPE), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/injectevent_fuzzer/BUILD.gn b/test/fuzztest/injectevent_fuzzer/BUILD.gn index 645c064ef94739dd5a974c2fe5fa61a5c4f8a234..e3b2c0b352bd9b17e97a463896ab68cb17e05abe 100644 --- a/test/fuzztest/injectevent_fuzzer/BUILD.gn +++ b/test/fuzztest/injectevent_fuzzer/BUILD.gn @@ -69,6 +69,13 @@ ohos_fuzztest("InjectEventFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "injectevent_fuzzer.cpp" ] deps = [ "${mmi_path}/frameworks/proxy:libmmi-client", diff --git a/test/fuzztest/notifynaponline_fuzzer/BUILD.gn b/test/fuzztest/notifynaponline_fuzzer/BUILD.gn index a0b2453a08da480be670cd8b4788a1b282327234..f13c4d0fd1d05942f73b360eda1cfb00916a1abe 100644 --- a/test/fuzztest/notifynaponline_fuzzer/BUILD.gn +++ b/test/fuzztest/notifynaponline_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("NotifyNapOnlineFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "notifynaponline_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/notifynaponline_fuzzer/notifynaponline_fuzzer.cpp b/test/fuzztest/notifynaponline_fuzzer/notifynaponline_fuzzer.cpp index 72964189d3d9dfa719963df7225d13fd290af27d..75320e7e0c2868330b8b28b9385ce6c340644ba7 100644 --- a/test/fuzztest/notifynaponline_fuzzer/notifynaponline_fuzzer.cpp +++ b/test/fuzztest/notifynaponline_fuzzer/notifynaponline_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool NotifyNapOnlineFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool NotifyNapOnlineFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::NOTIFY_NAP_ONLINE), datas, reply, option); + static_cast(MMI::IMultimodalInputConnectIpcCode::COMMAND_NOTIFY_NAP_ONLINE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/removeinputeventobserver_fuzzer/BUILD.gn b/test/fuzztest/removeinputeventobserver_fuzzer/BUILD.gn index 0120a517910757b089bf974073857e1e629b20a4..ea98b680532ad642b07cbeccec813bc36d7bacea 100644 --- a/test/fuzztest/removeinputeventobserver_fuzzer/BUILD.gn +++ b/test/fuzztest/removeinputeventobserver_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("RemoveInputEventObserverFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "removeinputeventobserver_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/removeinputeventobserver_fuzzer/removeinputeventobserver_fuzzer.cpp b/test/fuzztest/removeinputeventobserver_fuzzer/removeinputeventobserver_fuzzer.cpp index a15034c7966951819b6f3eef7c121769831a8cfd..80ba83c484a7c8f92d1825ba86a5e9bfe958b727 100644 --- a/test/fuzztest/removeinputeventobserver_fuzzer/removeinputeventobserver_fuzzer.cpp +++ b/test/fuzztest/removeinputeventobserver_fuzzer/removeinputeventobserver_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool RemoveInputEventObserverFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,8 @@ bool RemoveInputEventObserverFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::RMV_INPUT_EVENT_OBSERVER), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_REMOVE_INPUT_EVENT_OBSERVER), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/setcustomcursor_fuzzer/setcustomcursor_fuzzer.cpp b/test/fuzztest/setcustomcursor_fuzzer/setcustomcursor_fuzzer.cpp index 264c4903cc06ddcdc3ce6ff3ab04c77553e4044b..f7a23b40cfd047c2d160f79d9f66227efff930d8 100644 --- a/test/fuzztest/setcustomcursor_fuzzer/setcustomcursor_fuzzer.cpp +++ b/test/fuzztest/setcustomcursor_fuzzer/setcustomcursor_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool SetCustomCursorFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,8 @@ bool SetCustomCursorFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_CUSTOM_CURSOR), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_CUSTOM_CURSOR), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/setmousehotspot_fuzzer/BUILD.gn b/test/fuzztest/setmousehotspot_fuzzer/BUILD.gn index bc6bbdf804ec6f452305d8a7e9c712594657a6e7..e5a38792964b7bed5433f508042ca8bbd143de2d 100644 --- a/test/fuzztest/setmousehotspot_fuzzer/BUILD.gn +++ b/test/fuzztest/setmousehotspot_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("SetMouseHotSpotFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "setmousehotspot_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/setmousehotspot_fuzzer/setmousehotspot_fuzzer.cpp b/test/fuzztest/setmousehotspot_fuzzer/setmousehotspot_fuzzer.cpp index 30f719ca72960e5ada7ba9949c3d8705decf4cc6..a9802a3bd6ea9397696a6ffe1b6df0082118b501 100644 --- a/test/fuzztest/setmousehotspot_fuzzer/setmousehotspot_fuzzer.cpp +++ b/test/fuzztest/setmousehotspot_fuzzer/setmousehotspot_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool SetMouseHotSpotFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool SetMouseHotSpotFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_MOUSE_HOT_SPOT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_MOUSE_HOT_SPOT), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/setnapstatus_fuzzer/BUILD.gn b/test/fuzztest/setnapstatus_fuzzer/BUILD.gn index c8b431c91e64603123564121a664ba6b2bca79ae..731d3a94eb72a0ce73a4ee11287fb9f712f86dfd 100644 --- a/test/fuzztest/setnapstatus_fuzzer/BUILD.gn +++ b/test/fuzztest/setnapstatus_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("SetNapStatusFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "setnapstatus_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/setnapstatus_fuzzer/setnapstatus_fuzzer.cpp b/test/fuzztest/setnapstatus_fuzzer/setnapstatus_fuzzer.cpp index c087bdab37aa1b1ae50ca30f005384e6eb190f71..14a54614645beb761311cd504da5a25c9aabe467 100644 --- a/test/fuzztest/setnapstatus_fuzzer/setnapstatus_fuzzer.cpp +++ b/test/fuzztest/setnapstatus_fuzzer/setnapstatus_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool SetNapStatusFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool SetNapStatusFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_NAP_STATUS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_NAP_STATUS), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/setpointercolor_fuzzer/BUILD.gn b/test/fuzztest/setpointercolor_fuzzer/BUILD.gn index 226799902d3fadde25e2026df8fb36a2a2d1b559..07c0d73168d75f3e09c3abf056de14e2c2f9c777 100644 --- a/test/fuzztest/setpointercolor_fuzzer/BUILD.gn +++ b/test/fuzztest/setpointercolor_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("SetPointerColorFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "setpointercolor_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/setpointercolor_fuzzer/setpointercolor_fuzzer.cpp b/test/fuzztest/setpointercolor_fuzzer/setpointercolor_fuzzer.cpp index d211f8cb6cdcd91494b49b967283bd37d12767fc..9cff2ad5e924687726cfce53ddb0af5c08cda724 100644 --- a/test/fuzztest/setpointercolor_fuzzer/setpointercolor_fuzzer.cpp +++ b/test/fuzztest/setpointercolor_fuzzer/setpointercolor_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool SetPointerColorFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool SetPointerColorFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_POINTER_COLOR), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_POINTER_COLOR), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/setpointersize_fuzzer/BUILD.gn b/test/fuzztest/setpointersize_fuzzer/BUILD.gn index c99fbfdf1875320407efca6b9fa9ea2455a4eb13..da3ca39779a1cf8a0f91d32046adf951d91e1fe8 100644 --- a/test/fuzztest/setpointersize_fuzzer/BUILD.gn +++ b/test/fuzztest/setpointersize_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("SetPointerSizeFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "setpointersize_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/setpointersize_fuzzer/setpointersize_fuzzer.cpp b/test/fuzztest/setpointersize_fuzzer/setpointersize_fuzzer.cpp index ea9caffdfe721712b5341c6cdb0eb29ae203ed96..5d80d9987ee91dd3db0dc060b2c4eb5b7f20f5e6 100644 --- a/test/fuzztest/setpointersize_fuzzer/setpointersize_fuzzer.cpp +++ b/test/fuzztest/setpointersize_fuzzer/setpointersize_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool SetPointerSizeFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool SetPointerSizeFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_POINTER_SIZE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_POINTER_SIZE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/setshieldstatus_fuzzer/BUILD.gn b/test/fuzztest/setshieldstatus_fuzzer/BUILD.gn index da4ef528343cdf2eb99de021adcbfae87c42a91a..86ebce902493d4615ee1304c4cb6958cf59f0ebb 100644 --- a/test/fuzztest/setshieldstatus_fuzzer/BUILD.gn +++ b/test/fuzztest/setshieldstatus_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("SetShieldStatusFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "setshieldstatus_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/setshieldstatus_fuzzer/setshieldstatus_fuzzer.cpp b/test/fuzztest/setshieldstatus_fuzzer/setshieldstatus_fuzzer.cpp index 4b3eb47018db7c9e2108f6cae51fc37aa701089e..52e60537ca6f2aea81723df1246dc508b396f9f0 100644 --- a/test/fuzztest/setshieldstatus_fuzzer/setshieldstatus_fuzzer.cpp +++ b/test/fuzztest/setshieldstatus_fuzzer/setshieldstatus_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { namespace OHOS { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool SetShieldStatusFuzzTest(const uint8_t* data, size_t size) { @@ -37,7 +37,7 @@ bool SetShieldStatusFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_SHIELD_STATUS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_SHIELD_STATUS), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn b/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn index 00fb0d8f05754714348ff37b42fc5dbe02ec8845..66fe96098572ee6bd94aabc9aad6777f01fba737 100644 --- a/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn +++ b/test/fuzztest/shiftapppointerevent_fuzzer/BUILD.gn @@ -69,6 +69,13 @@ ohos_fuzztest("ShiftAppPointerEventFuzzTest") { "-Wno-unused-variable", "-fno-omit-frame-pointer", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "shiftapppointerevent_fuzzer.cpp" ] deps = [ "${mmi_path}/frameworks/proxy:libmmi-client", diff --git a/test/fuzztest/stubaddinputeventfilter_fuzzer/BUILD.gn b/test/fuzztest/stubaddinputeventfilter_fuzzer/BUILD.gn index 549de248b8c8f722b90898afc452041590009c77..a6a084888199a067277e90818cd7663f753affa0 100644 --- a/test/fuzztest/stubaddinputeventfilter_fuzzer/BUILD.gn +++ b/test/fuzztest/stubaddinputeventfilter_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubAddInputEventFilterFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubaddinputeventfilter_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubaddinputeventfilter_fuzzer/stubaddinputeventfilter_fuzzer.cpp b/test/fuzztest/stubaddinputeventfilter_fuzzer/stubaddinputeventfilter_fuzzer.cpp index 8015bf119c2cf8428f9deab2058eabb4cbafaed3..fc50ddf1c8a5b5ada203aed8950c007670e24969 100644 --- a/test/fuzztest/stubaddinputeventfilter_fuzzer/stubaddinputeventfilter_fuzzer.cpp +++ b/test/fuzztest/stubaddinputeventfilter_fuzzer/stubaddinputeventfilter_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubAddInputEventFilterFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubAddInputEventFilterFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::ADD_INPUT_EVENT_FILTER), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ADD_INPUT_EVENT_FILTER), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubaddinputhandler_fuzzer/BUILD.gn b/test/fuzztest/stubaddinputhandler_fuzzer/BUILD.gn index f69bf68aadbf6562238cf2e48be584161603dc56..80f56d0693ee3ffecc63c5d03d23553c829f0608 100644 --- a/test/fuzztest/stubaddinputhandler_fuzzer/BUILD.gn +++ b/test/fuzztest/stubaddinputhandler_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubAddInputHandlerFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubaddinputhandler_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubaddinputhandler_fuzzer/stubaddinputhandler_fuzzer.cpp b/test/fuzztest/stubaddinputhandler_fuzzer/stubaddinputhandler_fuzzer.cpp index 947b43de6dbfcd331dc13733f1bc57d035c11d41..a4bf0c5c62f3e91e5a044440b8653e4c3bd7dc78 100644 --- a/test/fuzztest/stubaddinputhandler_fuzzer/stubaddinputhandler_fuzzer.cpp +++ b/test/fuzztest/stubaddinputhandler_fuzzer/stubaddinputhandler_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubAddInputHandlerFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubAddInputHandlerFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::ADD_INPUT_HANDLER), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ADD_INPUT_HANDLER), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubappendextradata_fuzzer/BUILD.gn b/test/fuzztest/stubappendextradata_fuzzer/BUILD.gn index 407997bc1455b0ba250235eebce5a600e4f65b3a..fc5a9027e0434d3d4b84ab4849405e92258c6387 100644 --- a/test/fuzztest/stubappendextradata_fuzzer/BUILD.gn +++ b/test/fuzztest/stubappendextradata_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubAppendExtraDataFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubappendextradata_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubappendextradata_fuzzer/stubappendextradata_fuzzer.cpp b/test/fuzztest/stubappendextradata_fuzzer/stubappendextradata_fuzzer.cpp index 82a5fbc8cadb9a4e2b3f3dcf7292565b3263d61c..caae5513f25ed827a23ecf762fbeb3d782175747 100644 --- a/test/fuzztest/stubappendextradata_fuzzer/stubappendextradata_fuzzer.cpp +++ b/test/fuzztest/stubappendextradata_fuzzer/stubappendextradata_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubAppendExtraDataFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubAppendExtraDataFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::APPEND_EXTRA_DATA), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_APPEND_EXTRA_DATA), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubenableinputdevice_fuzzer/BUILD.gn b/test/fuzztest/stubenableinputdevice_fuzzer/BUILD.gn index 9a476bdf02219be0edbc96536c4d7c9385b9a769..5543ba034345e69dfad486e18765269575619d61 100644 --- a/test/fuzztest/stubenableinputdevice_fuzzer/BUILD.gn +++ b/test/fuzztest/stubenableinputdevice_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubEnableInputDeviceFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubenableinputdevice_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubenableinputdevice_fuzzer/stubenableinputdevice_fuzzer.cpp b/test/fuzztest/stubenableinputdevice_fuzzer/stubenableinputdevice_fuzzer.cpp index 1546e04c0566a2526223f1c9ac91ff448ff12ce7..278e17c7c7556c9b5d0e0c243b27249a5eea72e9 100644 --- a/test/fuzztest/stubenableinputdevice_fuzzer/stubenableinputdevice_fuzzer.cpp +++ b/test/fuzztest/stubenableinputdevice_fuzzer/stubenableinputdevice_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubEnableInputDeviceFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubEnableInputDeviceFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::ENABLE_INPUT_DEVICE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ENABLE_INPUT_DEVICE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgetdeviceids_fuzzer/BUILD.gn b/test/fuzztest/stubgetdeviceids_fuzzer/BUILD.gn index f8133c3dd29803b52a7780a4cb3210b5d244a63c..27639f3492db1ad0f5f10e6f8540d5acc0e8cb9e 100644 --- a/test/fuzztest/stubgetdeviceids_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetdeviceids_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetDeviceIdsFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetdeviceids_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetdeviceids_fuzzer/stubgetdeviceids_fuzzer.cpp b/test/fuzztest/stubgetdeviceids_fuzzer/stubgetdeviceids_fuzzer.cpp index 9d70e909b6f6c548a1af7f212f50fd99cc31bf91..397edc7c52d42807c3194531e74428bb8b0d90ff 100644 --- a/test/fuzztest/stubgetdeviceids_fuzzer/stubgetdeviceids_fuzzer.cpp +++ b/test/fuzztest/stubgetdeviceids_fuzzer/stubgetdeviceids_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubGetDeviceIdsFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubGetDeviceIdsFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_DEVICE_IDS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_DEVICE_IDS), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubgetdisplaybindinfo_fuzzer/BUILD.gn b/test/fuzztest/stubgetdisplaybindinfo_fuzzer/BUILD.gn index 186d68729749278037b94c8599db2b2b07b2fc88..ff78292be7311053c029cdd1303e7786e0a38ee6 100644 --- a/test/fuzztest/stubgetdisplaybindinfo_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetdisplaybindinfo_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetDisplayBindInfoFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetdisplaybindinfo_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetdisplaybindinfo_fuzzer/stubgetdisplaybindinfo_fuzzer.cpp b/test/fuzztest/stubgetdisplaybindinfo_fuzzer/stubgetdisplaybindinfo_fuzzer.cpp index 314b99b8cd65fe11981f03b84069033d4b4bbdee..67b0cbdd18fa04135f61c869542bda94d11fa853 100644 --- a/test/fuzztest/stubgetdisplaybindinfo_fuzzer/stubgetdisplaybindinfo_fuzzer.cpp +++ b/test/fuzztest/stubgetdisplaybindinfo_fuzzer/stubgetdisplaybindinfo_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetDisplayBindInfoFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetDisplayBindInfoFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_DISPLAY_BIND_INFO), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_DISPLAY_BIND_INFO), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgetfunctionkeystate_fuzzer/BUILD.gn b/test/fuzztest/stubgetfunctionkeystate_fuzzer/BUILD.gn index f333c808e7e41134ff1904f741d438b13878b4c6..39c53c590d97ef5951012a6ba0c0fb4dea4a36ca 100644 --- a/test/fuzztest/stubgetfunctionkeystate_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetfunctionkeystate_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetFunctionKeyStateFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetfunctionkeystate_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetfunctionkeystate_fuzzer/stubgetfunctionkeystate_fuzzer.cpp b/test/fuzztest/stubgetfunctionkeystate_fuzzer/stubgetfunctionkeystate_fuzzer.cpp index 9eedb59594e59d6321a389cc689f5295f29766f9..255c11220182e53e6a155917a3d443868827ced9 100644 --- a/test/fuzztest/stubgetfunctionkeystate_fuzzer/stubgetfunctionkeystate_fuzzer.cpp +++ b/test/fuzztest/stubgetfunctionkeystate_fuzzer/stubgetfunctionkeystate_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetFunctionKeyStateFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetFunctionKeyStateFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_FUNCTION_KEY_STATE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_FUNCTION_KEY_STATE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgethoverscrollstate_fuzzer/BUILD.gn b/test/fuzztest/stubgethoverscrollstate_fuzzer/BUILD.gn index 70303212f3bb5bdef5e375de95ea3111e7041ce2..aafa32047f8ce6916db2706d227f7fc5870a97d8 100644 --- a/test/fuzztest/stubgethoverscrollstate_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgethoverscrollstate_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetHoverScrollStateFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgethoverscrollstate_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgethoverscrollstate_fuzzer/stubgethoverscrollstate_fuzzer.cpp b/test/fuzztest/stubgethoverscrollstate_fuzzer/stubgethoverscrollstate_fuzzer.cpp index 9553eba9df1e29e88dc78c0027a3a047e60cada0..5ead204dc5edab92994c085bd54b907a9e695b09 100644 --- a/test/fuzztest/stubgethoverscrollstate_fuzzer/stubgethoverscrollstate_fuzzer.cpp +++ b/test/fuzztest/stubgethoverscrollstate_fuzzer/stubgethoverscrollstate_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetHoverScrollStateFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetHoverScrollStateFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_HOVER_SCROLL_STATE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_HOVER_SCROLL_STATE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgetkeyboardtype_fuzzer/BUILD.gn b/test/fuzztest/stubgetkeyboardtype_fuzzer/BUILD.gn index c2afb2f07ac04e07c6b37f35edfa16220a49b78a..0919f46879a508760c6b3dbfda694d9d4a367244 100644 --- a/test/fuzztest/stubgetkeyboardtype_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetkeyboardtype_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetKeyboardTypeFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetkeyboardtype_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetkeyboardtype_fuzzer/stubgetkeyboardtype_fuzzer.cpp b/test/fuzztest/stubgetkeyboardtype_fuzzer/stubgetkeyboardtype_fuzzer.cpp index c3b8e2b39e9947cf91ca83bee01f0fcdcf3fdd21..dd76cefe7a36886c28110651b0e100c87d0465b7 100644 --- a/test/fuzztest/stubgetkeyboardtype_fuzzer/stubgetkeyboardtype_fuzzer.cpp +++ b/test/fuzztest/stubgetkeyboardtype_fuzzer/stubgetkeyboardtype_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubGetKeyboardTypeFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubGetKeyboardTypeFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_KEYBOARD_TYPE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_KEYBOARD_TYPE), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubgetmouseprimarybutton_fuzzer/BUILD.gn b/test/fuzztest/stubgetmouseprimarybutton_fuzzer/BUILD.gn index 83f7ed19d4f37d9e0ebce6a2f6d280a193e7000f..ed13ebdb1205c45c16d56371d757c432d76ca6da 100644 --- a/test/fuzztest/stubgetmouseprimarybutton_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetmouseprimarybutton_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetMousePrimaryButtonFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetmouseprimarybutton_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetmouseprimarybutton_fuzzer/stubgetmouseprimarybutton_fuzzer.cpp b/test/fuzztest/stubgetmouseprimarybutton_fuzzer/stubgetmouseprimarybutton_fuzzer.cpp index 07aa53e052285859abb6ca9c80f683a4aecfdb1f..b3c3e41bcdffc5b1275a1af3448989217a12fbb1 100644 --- a/test/fuzztest/stubgetmouseprimarybutton_fuzzer/stubgetmouseprimarybutton_fuzzer.cpp +++ b/test/fuzztest/stubgetmouseprimarybutton_fuzzer/stubgetmouseprimarybutton_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetMousePrimaryButtonFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetMousePrimaryButtonFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_MOUSE_PRIMARY_BUTTON), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_MOUSE_PRIMARY_BUTTON), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgetmousescrollrows_fuzzer/BUILD.gn b/test/fuzztest/stubgetmousescrollrows_fuzzer/BUILD.gn index 27a1106cd0debba5148465f7ad1c8de84cdda3a8..79c4b6e7bda361bc929bcdfd1c422e987980b315 100644 --- a/test/fuzztest/stubgetmousescrollrows_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetmousescrollrows_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetMouseScrollRowsFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetmousescrollrows_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetmousescrollrows_fuzzer/stubgetmousescrollrows_fuzzer.cpp b/test/fuzztest/stubgetmousescrollrows_fuzzer/stubgetmousescrollrows_fuzzer.cpp index acb4f1364e2aa5105ec08830dbb5948e425a6c29..2c7e07987332ed8b687346bc62f35b860737b0b0 100644 --- a/test/fuzztest/stubgetmousescrollrows_fuzzer/stubgetmousescrollrows_fuzzer.cpp +++ b/test/fuzztest/stubgetmousescrollrows_fuzzer/stubgetmousescrollrows_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetMouseScrollRowsFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetMouseScrollRowsFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_MOUSE_SCROLL_ROWS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_MOUSE_SCROLL_ROWS), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgetpointersnapshot_fuzzer/BUILD.gn b/test/fuzztest/stubgetpointersnapshot_fuzzer/BUILD.gn index 44473261cdddb66a9cb93ba65a9a89b0c660fec7..1c53ff21fc3c0da65c07d0774a70f622e9b9730b 100644 --- a/test/fuzztest/stubgetpointersnapshot_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetpointersnapshot_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetPointerSnapshotFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetpointersnapshot_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetpointersnapshot_fuzzer/stubgetpointersnapshot_fuzzer.cpp b/test/fuzztest/stubgetpointersnapshot_fuzzer/stubgetpointersnapshot_fuzzer.cpp index 7ed12f0770e6ffd57e1990c1827cc34b6512939a..3e93eedd8a1984c89e2a995770dcf8bafad7d7cb 100644 --- a/test/fuzztest/stubgetpointersnapshot_fuzzer/stubgetpointersnapshot_fuzzer.cpp +++ b/test/fuzztest/stubgetpointersnapshot_fuzzer/stubgetpointersnapshot_fuzzer.cpp @@ -39,7 +39,7 @@ size_t GetObject(T &object, const uint8_t *data, size_t size) } return objectSize; } -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubGetPointerSnapshotFuzzTest(const uint8_t *data, size_t size) { @@ -56,7 +56,7 @@ bool StubGetPointerSnapshotFuzzTest(const uint8_t *data, size_t size) MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; #ifdef OHOS_BUILD_ENABLE_MAGICCURSOR MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_POINTER_SNAPSHOT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::GET_POINTER_SNAPSHOT), datas, reply, option); #endif // OHOS_BUILD_ENABLE_MAGICCURSOR return true; } diff --git a/test/fuzztest/stubgetpointerspeed_fuzzer/BUILD.gn b/test/fuzztest/stubgetpointerspeed_fuzzer/BUILD.gn index f882849b568254ab1332aaaaec782eed1f3bd92f..9751373281fdc696253ea76a961814802c911be8 100644 --- a/test/fuzztest/stubgetpointerspeed_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetpointerspeed_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetPointerSpeedFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetpointerspeed_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetpointerspeed_fuzzer/stubgetpointerspeed_fuzzer.cpp b/test/fuzztest/stubgetpointerspeed_fuzzer/stubgetpointerspeed_fuzzer.cpp index 9b0590c0e4b7fd8b8dda57db533fd521a8c4f561..8ae8f750f2b9d06d073c34fe0f4cffb9085b71fa 100644 --- a/test/fuzztest/stubgetpointerspeed_fuzzer/stubgetpointerspeed_fuzzer.cpp +++ b/test/fuzztest/stubgetpointerspeed_fuzzer/stubgetpointerspeed_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetPointerSpeedFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetPointerSpeedFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_POINTER_SPEED), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_POINTER_SPEED), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgetpointerstyle_fuzzer/BUILD.gn b/test/fuzztest/stubgetpointerstyle_fuzzer/BUILD.gn index 26ad148f6dbe0cbcf1aa595207d3fa943d169b17..c41b4b64bd217e0e90220614af50b32d83f9bf27 100644 --- a/test/fuzztest/stubgetpointerstyle_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetpointerstyle_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetPointerStyleFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetpointerstyle_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetpointerstyle_fuzzer/stubgetpointerstyle_fuzzer.cpp b/test/fuzztest/stubgetpointerstyle_fuzzer/stubgetpointerstyle_fuzzer.cpp index a33c598c7625a42ba0ea680724b0e982dcae745c..b7dce6555b28a1e71817a5959d8da28264b220b8 100644 --- a/test/fuzztest/stubgetpointerstyle_fuzzer/stubgetpointerstyle_fuzzer.cpp +++ b/test/fuzztest/stubgetpointerstyle_fuzzer/stubgetpointerstyle_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetPointerStyleFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetPointerStyleFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_POINTER_STYLE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_POINTER_STYLE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/BUILD.gn b/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/BUILD.gn index 1b1b475ae1acd0222d3e34291286554d7eec0be7..ac127ec042f10b653b744c0bffae9ee5ac8d9341 100644 --- a/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetTouchpadPinchSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgettouchpadpinchswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/stubgettouchpadpinchswitch_fuzzer.cpp b/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/stubgettouchpadpinchswitch_fuzzer.cpp index 4592555c65d2aa0a5f82da1b56e7c277fc81c493..f0084de6507f265d0a8363a9343d617f459f3301 100644 --- a/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/stubgettouchpadpinchswitch_fuzzer.cpp +++ b/test/fuzztest/stubgettouchpadpinchswitch_fuzzer/stubgettouchpadpinchswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetTouchpadPinchSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetTouchpadPinchSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_TP_PINCH_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_PINCH_SWITCH), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/BUILD.gn b/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/BUILD.gn index fb430baf7239cbeac1f04a7bcae9b7c436f01bd4..f9e1a9ddfb196feba5e3d493658f0636304d0ef4 100644 --- a/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetTouchpadPointerSpeedFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgettouchpadpointerspeed_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/stubgettouchpadpointerspeed_fuzzer.cpp b/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/stubgettouchpadpointerspeed_fuzzer.cpp index 59bb8c2e8d2bb57f6a03e80ad24113f7b59b0ac8..7216a8161540702457a2fe7e77ed16858c0031c2 100644 --- a/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/stubgettouchpadpointerspeed_fuzzer.cpp +++ b/test/fuzztest/stubgettouchpadpointerspeed_fuzzer/stubgettouchpadpointerspeed_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetTouchpadPointerSpeedFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,8 @@ bool StubGetTouchpadPointerSpeedFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_TP_POINTER_SPEED), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_POINTER_SPEED), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/BUILD.gn b/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/BUILD.gn index 3d2d5efbc55baea6a8c493c60d854a6f0440548f..5ead2cec97954654f080a1b7371877a75fd58df6 100644 --- a/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetTouchpadScrollDirectionFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgettouchpadscrolldirection_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/stubgettouchpadscrolldirection_fuzzer.cpp b/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/stubgettouchpadscrolldirection_fuzzer.cpp index d1bad508bfb51d6ce90abfc18cafc5eb06af6d2a..93881195989bfc017e02f9f0812d19f4316e4dc8 100644 --- a/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/stubgettouchpadscrolldirection_fuzzer.cpp +++ b/test/fuzztest/stubgettouchpadscrolldirection_fuzzer/stubgettouchpadscrolldirection_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetTouchpadScrollDirectionFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,8 @@ bool StubGetTouchpadScrollDirectionFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_TP_SCROLL_DIRECT_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_SCROLL_DIRECTION), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/BUILD.gn b/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/BUILD.gn index 3cf60cc668d4cd49825bb62ef4b142573f102f48..e1fa09f87309461282127260e5aab0c91ce04387 100644 --- a/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetTouchpadScrollSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgettouchpadscrollswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/stubgettouchpadscrollswitch_fuzzer.cpp b/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/stubgettouchpadscrollswitch_fuzzer.cpp index 906622f98b87430899c933e622d38b23df4e9f39..9711aefd54a1bdb298386463f87c4ad91843987d 100644 --- a/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/stubgettouchpadscrollswitch_fuzzer.cpp +++ b/test/fuzztest/stubgettouchpadscrollswitch_fuzzer/stubgettouchpadscrollswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetTouchpadScrollSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,8 @@ bool StubGetTouchpadScrollSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_TP_SCROLL_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_SCROLL_SWITCH), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/BUILD.gn b/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/BUILD.gn index 1115e306253ebd8073a74f86661e0169defea60e..f20c49356efacc661a2599850490bda40b150a04 100644 --- a/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubGetTouchpadSwipeSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgettouchpadswipeswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/stubgettouchpadswipeswitch_fuzzer.cpp b/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/stubgettouchpadswipeswitch_fuzzer.cpp index 18fa7372d18e3c2002d1b4d7431d62cb4978bb17..598aba045068a0f781cfef118073ad9e83f859c3 100644 --- a/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/stubgettouchpadswipeswitch_fuzzer.cpp +++ b/test/fuzztest/stubgettouchpadswipeswitch_fuzzer/stubgettouchpadswipeswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetTouchpadSwipeSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetTouchpadSwipeSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_TP_SWIPE_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_SWIPE_SWITCH), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgettouchpadtapswitch_fuzzer/BUILD.gn b/test/fuzztest/stubgettouchpadtapswitch_fuzzer/BUILD.gn index 8b1627e23e24c8f4ce3ca3544989b801021181bf..f3cc7950fbdf8903ce8c056828bdb6db288e1c53 100644 --- a/test/fuzztest/stubgettouchpadtapswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgettouchpadtapswitch_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetTouchpadTapSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgettouchpadtapswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgettouchpadtapswitch_fuzzer/stubgettouchpadtapswitch_fuzzer.cpp b/test/fuzztest/stubgettouchpadtapswitch_fuzzer/stubgettouchpadtapswitch_fuzzer.cpp index 9e1d74614bbdda6b1f07d4dc409214427a74c5e0..175368d532c274376f5c7e865222cf345d90df44 100644 --- a/test/fuzztest/stubgettouchpadtapswitch_fuzzer/stubgettouchpadtapswitch_fuzzer.cpp +++ b/test/fuzztest/stubgettouchpadtapswitch_fuzzer/stubgettouchpadtapswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetTouchpadTapSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetTouchpadTapSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_TP_TAP_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_TAP_SWITCH), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubgetwindowpid_fuzzer/BUILD.gn b/test/fuzztest/stubgetwindowpid_fuzzer/BUILD.gn index 794835c606f1924fa46ec31b5a55553fe6071ff4..028ae895bed866a02dbf6225da3529aa7adcb87e 100644 --- a/test/fuzztest/stubgetwindowpid_fuzzer/BUILD.gn +++ b/test/fuzztest/stubgetwindowpid_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubGetWindowPidFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubgetwindowpid_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubgetwindowpid_fuzzer/stubgetwindowpid_fuzzer.cpp b/test/fuzztest/stubgetwindowpid_fuzzer/stubgetwindowpid_fuzzer.cpp index df4068486794c1373d7837a2f0949c8fb802381d..9983abe2eb42d6a23b402920b6716909f699916d 100644 --- a/test/fuzztest/stubgetwindowpid_fuzzer/stubgetwindowpid_fuzzer.cpp +++ b/test/fuzztest/stubgetwindowpid_fuzzer/stubgetwindowpid_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubGetWindowPidFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubGetWindowPidFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::GET_WINDOW_PID), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_WINDOW_PID), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubhandleallocsocketfd_fuzzer/BUILD.gn b/test/fuzztest/stubhandleallocsocketfd_fuzzer/BUILD.gn index 0e1bf736e8170461aa0bf16f5bfc77e96ec64737..35bae98409398b86ddc796823cbda37f83905d66 100644 --- a/test/fuzztest/stubhandleallocsocketfd_fuzzer/BUILD.gn +++ b/test/fuzztest/stubhandleallocsocketfd_fuzzer/BUILD.gn @@ -53,10 +53,18 @@ ohos_fuzztest("StubHandleAllocSocketFdFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubhandleallocsocketfd_fuzzer.cpp" ] deps = [ "${mmi_path}/frameworks/proxy:libmmi-client", + "${mmi_path}/frameworks/proxy:libmmi-common", "${mmi_path}/service:libmmi-server", "${mmi_path}/util:libmmi-util", ] diff --git a/test/fuzztest/stubhandleallocsocketfd_fuzzer/stubhandleallocsocketfd_fuzzer.cpp b/test/fuzztest/stubhandleallocsocketfd_fuzzer/stubhandleallocsocketfd_fuzzer.cpp index db11aaa97460fdb676e241926d48e8ca324ea778..c3d66aa3e309b948198bd3c7b800e48e968836e1 100644 --- a/test/fuzztest/stubhandleallocsocketfd_fuzzer/stubhandleallocsocketfd_fuzzer.cpp +++ b/test/fuzztest/stubhandleallocsocketfd_fuzzer/stubhandleallocsocketfd_fuzzer.cpp @@ -26,11 +26,15 @@ using SessionPtr = std::shared_ptr; namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +namespace { +constexpr int64_t FREQ_TWO = 2; +} // namespace +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; EpollEventType event_type = EPOLL_EVENT_SIGNAL; InputHandlerType handlerType = NONE; HandleEventType eventType = HANDLE_EVENT_TYPE_NONE; int32_t tmpfd = 1; +int32_t tmpPid = 1; uint32_t tmp32 = 1; int32_t type = 1; int64_t number = 1; @@ -45,8 +49,7 @@ std::vector vecInt = { 1, 2, 3 }; std::vector vecBool = { 1 }; std::vector argString = { u"hello", u"worid" }; std::vector patternInt = { 1, 2, 3 }; -std::map mpInt = { { 1, 2 }, { 2, 2 }, { 3, 2 } }; -std::vector requencysInf = { { 1, 2 }, { 2, 2 } }; +std::unordered_map mpInt = { { 1, 2 }, { 2, 2 }, { 3, 2 } }; int32_t g_tmpDate = 1; void* g_pixelMapPtr = &g_tmpDate; bool g_isAuthorize = true; @@ -73,13 +76,25 @@ bool StubHandleAllocSocketFdFuzzTest(const uint8_t *data, size_t size) } MessageParcel reply; MessageOption option; + CursorPixelMap curPixelMap; + curPixelMap.pixelMap = g_pixelMapPtr; + InfraredFrequency freq1 {}; + freq1.max_ = 1; + freq1.min_ = FREQ_TWO; + InfraredFrequency freq2 {}; + freq2.max_ = FREQ_TWO; + freq2.min_ = FREQ_TWO; + std::vector requencysInf {}; + requencysInf.push_back(freq1); + requencysInf.push_back(freq2); + std::vector actionsType {}; MMIService::GetInstance()->AddEpoll(event_type, tmpfd); MMIService::GetInstance()->DelEpoll(event_type, tmpfd); MMIService::GetInstance()->InitLibinputService(); MMIService::GetInstance()->InitDelegateTasks(); MMIService::GetInstance()->AddAppDebugListener(); MMIService::GetInstance()->SetMouseScrollRows(tmpfd); - MMIService::GetInstance()->SetMouseIcon(tmpfd, g_pixelMapPtr); + MMIService::GetInstance()->SetMouseIcon(tmpfd, curPixelMap); MMIService::GetInstance()->ReadMouseScrollRows(tmpfd); MMIService::GetInstance()->MarkProcessed(tmpfd, tmpfd); MMIService::GetInstance()->ReadPointerColor(tmpfd); @@ -92,12 +107,12 @@ bool StubHandleAllocSocketFdFuzzTest(const uint8_t *data, size_t size) MMIService::GetInstance()->RemoveInputHandler(handlerType, eventType, tmpfd, tmp32); MMIService::GetInstance()->MarkEventConsumed(tmpfd); MMIService::GetInstance()->MoveMouseEvent(tmpfd, tmpfd); - MMIService::GetInstance()->InjectKeyEvent(keyEvent, g_isNativeInject); + MMIService::GetInstance()->InjectKeyEvent(*keyEvent.get(), g_isNativeInject); MMIService::GetInstance()->CheckInjectKeyEvent(keyEvent, tmpfd, g_isNativeInject); MMIService::GetInstance()->OnGetKeyState(vecInt, mpInt); - MMIService::GetInstance()->InjectPointerEvent(pointerEvent, g_isNativeInject); + MMIService::GetInstance()->InjectPointerEvent(*pointerEvent.get(), g_isNativeInject); MMIService::GetInstance()->OnAddSystemAbility(tmpfd, "deviceId"); - MMIService::GetInstance()->SubscribeKeyEvent(tmpfd, p_option); + MMIService::GetInstance()->SubscribeKeyEvent(tmpfd, *p_option.get()); MMIService::GetInstance()->UnsubscribeKeyEvent(tmpfd); MMIService::GetInstance()->SubscribeSwitchEvent(tmpfd, tmpfd); MMIService::GetInstance()->SetDisplayBind(tmpfd, tmpfd, message); @@ -106,7 +121,7 @@ bool StubHandleAllocSocketFdFuzzTest(const uint8_t *data, size_t size) MMIService::GetInstance()->AddReloadDeviceTimer(); MMIService::GetInstance()->Dump(tmpfd, argString); MMIService::GetInstance()->OnGetWindowPid(tmpfd, tmpfd); - MMIService::GetInstance()->GetWindowPid(tmpfd); + MMIService::GetInstance()->GetWindowPid(tmpfd, tmpPid); MMIService::GetInstance()->SetKeyDownDuration(businessId, tmpfd); MMIService::GetInstance()->ReadTouchpadScrollSwich(g_switchFlag); MMIService::GetInstance()->ReadTouchpadScrollDirection(g_switchFlag); @@ -138,18 +153,18 @@ bool StubHandleAllocSocketFdFuzzTest(const uint8_t *data, size_t size) MMIService::GetInstance()->OnCancelInjection(); MMIService::GetInstance()->GetInfraredFrequencies(requencysInf); MMIService::GetInstance()->TransmitInfrared(number, patternInt); - MMIService::GetInstance()->SetPixelMapData(infoId, g_pixelMapPtr); + MMIService::GetInstance()->SetPixelMapData(infoId, curPixelMap); MMIService::GetInstance()->SetCurrentUser(userId); - MMIService::GetInstance()->AddVirtualInputDevice(device, deviceId); + MMIService::GetInstance()->AddVirtualInputDevice(*device.get(), deviceId); MMIService::GetInstance()->RemoveVirtualInputDevice(tmpfd); MMIService::GetInstance()->EnableHardwareCursorStats(g_enableFlag); MMIService::GetInstance()->GetHardwareCursorStats(frameCount, vsyncCount); #ifdef OHOS_BUILD_ENABLE_MAGICCURSOR - MMIService::GetInstance()->GetPointerSnapshot(g_pixelMapPtr); + MMIService::GetInstance()->GetPointerSnapshot(*pixelMapPtr); #endif // OHOS_BUILD_ENABLE_MAGICCURSOR MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::ALLOC_SOCKET_FD), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ALLOC_SOCKET_FD), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubinjectkeyevent_fuzzer/BUILD.gn b/test/fuzztest/stubinjectkeyevent_fuzzer/BUILD.gn index 84d76eb1d6ebee17489823ae65a8d8115d6cf364..217d644af4704bf81ea81af3a5fefa9c16b75260 100644 --- a/test/fuzztest/stubinjectkeyevent_fuzzer/BUILD.gn +++ b/test/fuzztest/stubinjectkeyevent_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubInjectKeyEventFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubinjectkeyevent_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubinjectkeyevent_fuzzer/stubinjectkeyevent_fuzzer.cpp b/test/fuzztest/stubinjectkeyevent_fuzzer/stubinjectkeyevent_fuzzer.cpp index cae1ea6976daa1fb45515634942188ae91a92998..e217c36f87b3b082f26848d615a99f06aa095646 100644 --- a/test/fuzztest/stubinjectkeyevent_fuzzer/stubinjectkeyevent_fuzzer.cpp +++ b/test/fuzztest/stubinjectkeyevent_fuzzer/stubinjectkeyevent_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubInjectKeyEventFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubInjectKeyEventFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::INJECT_KEY_EVENT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_INJECT_KEY_EVENT), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubinjectpointerevent_fuzzer/BUILD.gn b/test/fuzztest/stubinjectpointerevent_fuzzer/BUILD.gn index 880af2b822b816d379dd099a66e38f6f75a14f21..8867511bb1f55d1e496dbfd4335e1a850636dd8d 100644 --- a/test/fuzztest/stubinjectpointerevent_fuzzer/BUILD.gn +++ b/test/fuzztest/stubinjectpointerevent_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubInjectPointerEventFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubinjectpointerevent_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubinjectpointerevent_fuzzer/stubinjectpointerevent_fuzzer.cpp b/test/fuzztest/stubinjectpointerevent_fuzzer/stubinjectpointerevent_fuzzer.cpp index 7b3f098258920abcfbb7098c710642d857a460cb..7f4691a16e28ba8f139a473bb35e360f2aef3612 100644 --- a/test/fuzztest/stubinjectpointerevent_fuzzer/stubinjectpointerevent_fuzzer.cpp +++ b/test/fuzztest/stubinjectpointerevent_fuzzer/stubinjectpointerevent_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubInjectPointerEventFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubInjectPointerEventFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::INJECT_POINTER_EVENT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_INJECT_POINTER_EVENT), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubispointervisible_fuzzer/BUILD.gn b/test/fuzztest/stubispointervisible_fuzzer/BUILD.gn index 67922add8a7958db5f194fc10d70761624134aaf..3d1bbbc73ed7346b8322db893d8322c3f5e5a297 100644 --- a/test/fuzztest/stubispointervisible_fuzzer/BUILD.gn +++ b/test/fuzztest/stubispointervisible_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubIsPointerVisibleFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubispointervisible_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubispointervisible_fuzzer/stubispointervisible_fuzzer.cpp b/test/fuzztest/stubispointervisible_fuzzer/stubispointervisible_fuzzer.cpp index 6c619d5840e3a3bbaa5e2fb9718940f1e6e4d88c..dfee91e3460b191bd05db393668b10fa9054260d 100644 --- a/test/fuzztest/stubispointervisible_fuzzer/stubispointervisible_fuzzer.cpp +++ b/test/fuzztest/stubispointervisible_fuzzer/stubispointervisible_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubIsPointerVisibleFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubIsPointerVisibleFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::IS_POINTER_VISIBLE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_IS_POINTER_VISIBLE), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubmarkprocessed_fuzzer/BUILD.gn b/test/fuzztest/stubmarkprocessed_fuzzer/BUILD.gn index ce0180fd7a4e6f9866d85252b599169400943cdc..f3df0c3e8bbb2ea8e4f5a00aa700ad2824db52ed 100644 --- a/test/fuzztest/stubmarkprocessed_fuzzer/BUILD.gn +++ b/test/fuzztest/stubmarkprocessed_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubMarkProcessedFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubmarkprocessed_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubmarkprocessed_fuzzer/stubmarkprocessed_fuzzer.cpp b/test/fuzztest/stubmarkprocessed_fuzzer/stubmarkprocessed_fuzzer.cpp index a4dd7c3c3b8e1626e0ed027539aa037ab1ddb4b8..850f3dcd6ab50cf032474d9c7d7022aec9b89da0 100644 --- a/test/fuzztest/stubmarkprocessed_fuzzer/stubmarkprocessed_fuzzer.cpp +++ b/test/fuzztest/stubmarkprocessed_fuzzer/stubmarkprocessed_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubMarkProcessedFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubMarkProcessedFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::MARK_PROCESSED), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_MARK_PROCESSED), datas, reply, option); return true; } } // MMI diff --git a/test/fuzztest/stubmovemouseevent_fuzzer/BUILD.gn b/test/fuzztest/stubmovemouseevent_fuzzer/BUILD.gn index b357213dc7873cabaebeb3a87c2fb78d0bb36472..a3c17f6385b73782c1ab73a92ce5d523ce42fe3c 100644 --- a/test/fuzztest/stubmovemouseevent_fuzzer/BUILD.gn +++ b/test/fuzztest/stubmovemouseevent_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubMoveMouseEventFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubmovemouseevent_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubmovemouseevent_fuzzer/stubmovemouseevent_fuzzer.cpp b/test/fuzztest/stubmovemouseevent_fuzzer/stubmovemouseevent_fuzzer.cpp index 757dbbf3b05a288e2b04f918942b29d7b23155ef..982c713e6f27b9676cb8b7df7344ee10e75c89ed 100644 --- a/test/fuzztest/stubmovemouseevent_fuzzer/stubmovemouseevent_fuzzer.cpp +++ b/test/fuzztest/stubmovemouseevent_fuzzer/stubmovemouseevent_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubMoveMouseEventFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubMoveMouseEventFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::MOVE_MOUSE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_MOVE_MOUSE_EVENT), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/BUILD.gn b/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/BUILD.gn index 702fcde26c5da8cf2428209e968f78b9e4bc8507..ef7f878fe70cbfe742246f0238a5985b5e8eb0fd 100644 --- a/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/BUILD.gn +++ b/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/BUILD.gn @@ -53,6 +53,13 @@ ohos_fuzztest("StubRegisterInputDeviceMonitorFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubregisterinputdevicemonitor_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/stubregisterinputdevicemonitor_fuzzer.cpp b/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/stubregisterinputdevicemonitor_fuzzer.cpp index 95840b41b1a7f91c99a4692df5a354d790ef4056..1233bbb0f8505688fe49daceb19f21336c56dc61 100644 --- a/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/stubregisterinputdevicemonitor_fuzzer.cpp +++ b/test/fuzztest/stubregisterinputdevicemonitor_fuzzer/stubregisterinputdevicemonitor_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubRegisterInputDeviceMonitorFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubRegisterInputDeviceMonitorFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::REGISTER_DEV_MONITOR), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_REGISTER_DEV_LISTENER), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubremoveinputeventfilter_fuzzer/BUILD.gn b/test/fuzztest/stubremoveinputeventfilter_fuzzer/BUILD.gn index 7eb32ee78ba752fa24b4ae6b98996ce6453f398a..46ad17ff989def6f33598a61bbf611a283d48861 100644 --- a/test/fuzztest/stubremoveinputeventfilter_fuzzer/BUILD.gn +++ b/test/fuzztest/stubremoveinputeventfilter_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubRemoveInputEventFilterFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubremoveinputeventfilter_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubremoveinputeventfilter_fuzzer/stubremoveinputeventfilter_fuzzer.cpp b/test/fuzztest/stubremoveinputeventfilter_fuzzer/stubremoveinputeventfilter_fuzzer.cpp index d194d935eb8b103775e467478f8213fea93c3080..4232137e2f31f47ef98591243803e6dfe5e7b102 100644 --- a/test/fuzztest/stubremoveinputeventfilter_fuzzer/stubremoveinputeventfilter_fuzzer.cpp +++ b/test/fuzztest/stubremoveinputeventfilter_fuzzer/stubremoveinputeventfilter_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubRemoveInputEventFilterFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubRemoveInputEventFilterFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::RMV_INPUT_EVENT_FILTER), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_REMOVE_INPUT_EVENT_FILTER), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubremoveinputhandler_fuzzer/BUILD.gn b/test/fuzztest/stubremoveinputhandler_fuzzer/BUILD.gn index e00e2030ee5efdf6e03f8071b4ee74d0d2a072a9..2777306536c5d35bdb09960ebd1fbfd505b1fb1a 100644 --- a/test/fuzztest/stubremoveinputhandler_fuzzer/BUILD.gn +++ b/test/fuzztest/stubremoveinputhandler_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubRemoveInputHandlerFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubremoveinputhandler_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubremoveinputhandler_fuzzer/stubremoveinputhandler_fuzzer.cpp b/test/fuzztest/stubremoveinputhandler_fuzzer/stubremoveinputhandler_fuzzer.cpp index 1af5a14a3d36b75dd891e26590deb790af7ee6a6..00c0299dd337e6b0217971b3dd55ae495039e316 100644 --- a/test/fuzztest/stubremoveinputhandler_fuzzer/stubremoveinputhandler_fuzzer.cpp +++ b/test/fuzztest/stubremoveinputhandler_fuzzer/stubremoveinputhandler_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubRemoveInputHandlerFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubRemoveInputHandlerFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::REMOVE_INPUT_HANDLER), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_REMOVE_INPUT_HANDLER), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubsetanrlistener_fuzzer/BUILD.gn b/test/fuzztest/stubsetanrlistener_fuzzer/BUILD.gn index adaa1dd9045da0a288f116e39bd39ef8546e46dd..f97acf9c59e35e9b3835a6b8cc2c16ff14e3159f 100644 --- a/test/fuzztest/stubsetanrlistener_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetanrlistener_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetAnrListenerFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetanrlistener_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetanrlistener_fuzzer/stubsetanrlistener_fuzzer.cpp b/test/fuzztest/stubsetanrlistener_fuzzer/stubsetanrlistener_fuzzer.cpp index 493252cee6ceb428eac988a99ffc7c25507ba534..7a81d5030efb78d84bdc5e5c7c413600ac009aa3 100644 --- a/test/fuzztest/stubsetanrlistener_fuzzer/stubsetanrlistener_fuzzer.cpp +++ b/test/fuzztest/stubsetanrlistener_fuzzer/stubsetanrlistener_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubSetAnrListenerFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubSetAnrListenerFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_ANR_OBSERVER), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_ANR_OBSERVER), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubsetdisplaybind_fuzzer/BUILD.gn b/test/fuzztest/stubsetdisplaybind_fuzzer/BUILD.gn index 5845b16fe1c9e20a9c18867fa75349774fa9a024..338c285a88438287a6ca9986498d252a205e2955 100644 --- a/test/fuzztest/stubsetdisplaybind_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetdisplaybind_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetDisplayBindFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetdisplaybind_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetdisplaybind_fuzzer/stubsetdisplaybind_fuzzer.cpp b/test/fuzztest/stubsetdisplaybind_fuzzer/stubsetdisplaybind_fuzzer.cpp index 3509e8289a51b4da88cabb69f1b69a5f7b0b0a0d..cdbacb73ca32a32bea521d087b2e424620b0a07a 100644 --- a/test/fuzztest/stubsetdisplaybind_fuzzer/stubsetdisplaybind_fuzzer.cpp +++ b/test/fuzztest/stubsetdisplaybind_fuzzer/stubsetdisplaybind_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetDisplayBindFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetDisplayBindFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_DISPLAY_BIND), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_DISPLAY_BIND), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetfunctionkeystate_fuzzer/BUILD.gn b/test/fuzztest/stubsetfunctionkeystate_fuzzer/BUILD.gn index a100afb76e9457a353c8b474ed4903165fdefed8..e976db47b7d8838c13cfc2efecadf786e0509a3f 100644 --- a/test/fuzztest/stubsetfunctionkeystate_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetfunctionkeystate_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetFunctionKeyStateFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetfunctionkeystate_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetfunctionkeystate_fuzzer/stubsetfunctionkeystate_fuzzer.cpp b/test/fuzztest/stubsetfunctionkeystate_fuzzer/stubsetfunctionkeystate_fuzzer.cpp index 982f90e38209ccf4a25ff883930fb5499c4ec99a..65a78d9687bfa6c845de28c23a8de8fa04195df3 100644 --- a/test/fuzztest/stubsetfunctionkeystate_fuzzer/stubsetfunctionkeystate_fuzzer.cpp +++ b/test/fuzztest/stubsetfunctionkeystate_fuzzer/stubsetfunctionkeystate_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetFunctionKeyStateFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetFunctionKeyStateFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_FUNCTION_KEY_STATE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_FUNCTION_KEY_STATE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsethoverscrollstate_fuzzer/BUILD.gn b/test/fuzztest/stubsethoverscrollstate_fuzzer/BUILD.gn index 7528bc9f2b165672b0686acd3f64eda12d0d5e5d..b7569bb4bb721c108881020c8ff25633f0c0ee47 100644 --- a/test/fuzztest/stubsethoverscrollstate_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsethoverscrollstate_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetHoverScrollStateFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsethoverscrollstate_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsethoverscrollstate_fuzzer/stubsethoverscrollstate_fuzzer.cpp b/test/fuzztest/stubsethoverscrollstate_fuzzer/stubsethoverscrollstate_fuzzer.cpp index 3bef3c59b7a9689a6b109de99c1e5a1b90f4b856..835887c628ca21d775a1a9998d2d0f17d3829b25 100644 --- a/test/fuzztest/stubsethoverscrollstate_fuzzer/stubsethoverscrollstate_fuzzer.cpp +++ b/test/fuzztest/stubsethoverscrollstate_fuzzer/stubsethoverscrollstate_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetHoverScrollStateFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetHoverScrollStateFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_HOVER_SCROLL_STATE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_HOVER_SCROLL_STATE), datas, reply, option); DelayedSingleton::DestroyInstance(); return true; } diff --git a/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/BUILD.gn b/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/BUILD.gn index 1a006f91eb8661e2517f8e7759a4859129a66de5..2794d873cf570d5fb305e78e5a3fb41acea0b53b 100644 --- a/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetKeyboardRepeatDelayFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetkeyboardrepeatdelay_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/stubsetkeyboardrepeatdelay_fuzzer.cpp b/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/stubsetkeyboardrepeatdelay_fuzzer.cpp index 47b22cf247a01d4fb323212da45d71fa9692bd93..c1bc51a552f9d6e6b133dc27736d95576e5cd6d9 100644 --- a/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/stubsetkeyboardrepeatdelay_fuzzer.cpp +++ b/test/fuzztest/stubsetkeyboardrepeatdelay_fuzzer/stubsetkeyboardrepeatdelay_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetKeyboardRepeatDelayFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetKeyboardRepeatDelayFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_KEYBOARD_REPEAT_DELAY), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_KEYBOARD_REPEAT_DELAY), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/BUILD.gn b/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/BUILD.gn index cd2ab94513beae708a6079cf25725fa2b1448f5f..189019b07814fefe26a4fb51abdcd47a02af5ec2 100644 --- a/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetKeyboardRepeatRateFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetkeyboardrepeatrate_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/stubsetkeyboardrepeatrate_fuzzer.cpp b/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/stubsetkeyboardrepeatrate_fuzzer.cpp index f32e318b933716ec4c79e975aae86783800d664e..2b9e9f3f43e6e1bdcb8245f36709f48c863f726f 100644 --- a/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/stubsetkeyboardrepeatrate_fuzzer.cpp +++ b/test/fuzztest/stubsetkeyboardrepeatrate_fuzzer/stubsetkeyboardrepeatrate_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetKeyboardRepeatRateFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetKeyboardRepeatRateFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_KEYBOARD_REPEAT_RATE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_KEYBOARD_REPEAT_RATE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetkeydownduration_fuzzer/BUILD.gn b/test/fuzztest/stubsetkeydownduration_fuzzer/BUILD.gn index b2d2baab9465329996bf4036e661967e97f888ff..5c56663c70bebb0a9f893082e8db55c0185d991f 100644 --- a/test/fuzztest/stubsetkeydownduration_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetkeydownduration_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetKeyDownDurationFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetkeydownduration_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetkeydownduration_fuzzer/stubsetkeydownduration_fuzzer.cpp b/test/fuzztest/stubsetkeydownduration_fuzzer/stubsetkeydownduration_fuzzer.cpp index 43c988a076efbc5fbc93cd13491926b84d51545c..63e6dba3f00e9c948b0cb03a6cd2b84c71cf84c1 100644 --- a/test/fuzztest/stubsetkeydownduration_fuzzer/stubsetkeydownduration_fuzzer.cpp +++ b/test/fuzztest/stubsetkeydownduration_fuzzer/stubsetkeydownduration_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetKeyDownDurationFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetKeyDownDurationFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_KEY_DOWN_DURATION), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_KEY_DOWN_DURATION), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetmousecapturemode_fuzzer/BUILD.gn b/test/fuzztest/stubsetmousecapturemode_fuzzer/BUILD.gn index c1156b8479ec536eee1d61f06a6761bfeda42c5b..1aa008e19136ad6cd16c6c44fa0f5f90bb282728 100644 --- a/test/fuzztest/stubsetmousecapturemode_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetmousecapturemode_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetMouseCaptureModeFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetmousecapturemode_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetmousecapturemode_fuzzer/stubsetmousecapturemode_fuzzer.cpp b/test/fuzztest/stubsetmousecapturemode_fuzzer/stubsetmousecapturemode_fuzzer.cpp index 099fabe18a49ec906a92e7713fb02873d515881a..680934a5b444559dcd824e9192f24290e6e4aa21 100644 --- a/test/fuzztest/stubsetmousecapturemode_fuzzer/stubsetmousecapturemode_fuzzer.cpp +++ b/test/fuzztest/stubsetmousecapturemode_fuzzer/stubsetmousecapturemode_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetMouseCaptureModeFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetMouseCaptureModeFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_CAPTURE_MODE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_MOUSE_CAPTURE_MODE), datas, reply, option); DelayedSingleton::DestroyInstance(); return true; } diff --git a/test/fuzztest/stubsetmouseicon_fuzzer/stubsetmouseicon_fuzzer.cpp b/test/fuzztest/stubsetmouseicon_fuzzer/stubsetmouseicon_fuzzer.cpp index 0eb8fa20dfc02fbddad3441e1c077973b3f0e344..1a0bc9b303aea687ae7b6c03d5599a031dc19056 100644 --- a/test/fuzztest/stubsetmouseicon_fuzzer/stubsetmouseicon_fuzzer.cpp +++ b/test/fuzztest/stubsetmouseicon_fuzzer/stubsetmouseicon_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetMouseIconFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetMouseIconFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_MOUSE_ICON), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_MOUSE_ICON), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetmouseprimarybutton_fuzzer/BUILD.gn b/test/fuzztest/stubsetmouseprimarybutton_fuzzer/BUILD.gn index 5312b0d80d386d9f70220e68f1f0dd40988d109b..0980aa8578bb62141245c4901a0b5d307fcd21f4 100644 --- a/test/fuzztest/stubsetmouseprimarybutton_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetmouseprimarybutton_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetMousePrimaryButtonFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetmouseprimarybutton_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetmouseprimarybutton_fuzzer/stubsetmouseprimarybutton_fuzzer.cpp b/test/fuzztest/stubsetmouseprimarybutton_fuzzer/stubsetmouseprimarybutton_fuzzer.cpp index 1a74ca1a87499d6877ed7497132c527a31c4edd2..551ef4c612f0ba5e0937fa3b6ff9f10506562e74 100644 --- a/test/fuzztest/stubsetmouseprimarybutton_fuzzer/stubsetmouseprimarybutton_fuzzer.cpp +++ b/test/fuzztest/stubsetmouseprimarybutton_fuzzer/stubsetmouseprimarybutton_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetMousePrimaryButtonFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetMousePrimaryButtonFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_MOUSE_PRIMARY_BUTTON), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_MOUSE_PRIMARY_BUTTON), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetmousescrollrows_fuzzer/BUILD.gn b/test/fuzztest/stubsetmousescrollrows_fuzzer/BUILD.gn index dadc8624983925cfeef1dabcfbdd23654e0b02a9..7c99c39f3f9004e4f34c0633881056bd12007321 100644 --- a/test/fuzztest/stubsetmousescrollrows_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetmousescrollrows_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetMouseScrollRowsFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetmousescrollrows_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetmousescrollrows_fuzzer/stubsetmousescrollrows_fuzzer.cpp b/test/fuzztest/stubsetmousescrollrows_fuzzer/stubsetmousescrollrows_fuzzer.cpp index 006fa30056b14971db8072edd47ac1418aa29d46..fe27c4c6c889f664a1e513619e6fa23ef107949e 100644 --- a/test/fuzztest/stubsetmousescrollrows_fuzzer/stubsetmousescrollrows_fuzzer.cpp +++ b/test/fuzztest/stubsetmousescrollrows_fuzzer/stubsetmousescrollrows_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetMouseScrollRowsFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetMouseScrollRowsFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_MOUSE_SCROLL_ROWS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_MOUSE_SCROLL_ROWS), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetpointerlocation_fuzzer/BUILD.gn b/test/fuzztest/stubsetpointerlocation_fuzzer/BUILD.gn index 23dff80da1ac71c6f55d6aa9e97d0f61194f7aaa..7b05bf0223f5acc77c19e240acaca4d7d76b801e 100644 --- a/test/fuzztest/stubsetpointerlocation_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetpointerlocation_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetPointerLocationFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetpointerlocation_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetpointerlocation_fuzzer/stubsetpointerlocation_fuzzer.cpp b/test/fuzztest/stubsetpointerlocation_fuzzer/stubsetpointerlocation_fuzzer.cpp index 388129cd4f4517cf4138daf4cac39e774dd48b87..225cb2656cf92b66bce2007240083683fb508427 100644 --- a/test/fuzztest/stubsetpointerlocation_fuzzer/stubsetpointerlocation_fuzzer.cpp +++ b/test/fuzztest/stubsetpointerlocation_fuzzer/stubsetpointerlocation_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetPointerLocationFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetPointerLocationFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_POINTER_LOCATION), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_POINTER_LOCATION), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetpointerspeed_fuzzer/BUILD.gn b/test/fuzztest/stubsetpointerspeed_fuzzer/BUILD.gn index be816124785f44027523b27db343ad3fb38b992e..569763279ecefae67479e9464655ae6ea8ec072f 100644 --- a/test/fuzztest/stubsetpointerspeed_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetpointerspeed_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetPointerSpeedFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetpointerspeed_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetpointerspeed_fuzzer/stubsetpointerspeed_fuzzer.cpp b/test/fuzztest/stubsetpointerspeed_fuzzer/stubsetpointerspeed_fuzzer.cpp index 4ba4c9299a6267de619152f2688a038e6c6119bd..29f91cec03fdecda4de3d81b4ec458f5738f1359 100644 --- a/test/fuzztest/stubsetpointerspeed_fuzzer/stubsetpointerspeed_fuzzer.cpp +++ b/test/fuzztest/stubsetpointerspeed_fuzzer/stubsetpointerspeed_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubSetPointerSpeedFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubSetPointerSpeedFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_POINTER_SPEED), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_POINTER_SPEED), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubsetpointerstyle_fuzzer/BUILD.gn b/test/fuzztest/stubsetpointerstyle_fuzzer/BUILD.gn index d122e320ff4c284e10cc92e60f032f8cca17d393..264c09ce5cea27cebcc22ac5f7dd1ec865afef71 100644 --- a/test/fuzztest/stubsetpointerstyle_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetpointerstyle_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetPointerStyleFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetpointerstyle_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetpointerstyle_fuzzer/stubsetpointerstyle_fuzzer.cpp b/test/fuzztest/stubsetpointerstyle_fuzzer/stubsetpointerstyle_fuzzer.cpp index 51924e513faf5ac6d1753b67053c0212e8b6e4f0..ca71fe374eef3033d020a7567a3887d534012f8f 100644 --- a/test/fuzztest/stubsetpointerstyle_fuzzer/stubsetpointerstyle_fuzzer.cpp +++ b/test/fuzztest/stubsetpointerstyle_fuzzer/stubsetpointerstyle_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetPointerStyleFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetPointerStyleFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_POINTER_STYLE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_POINTER_STYLE), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsetpointervisible_fuzzer/BUILD.gn b/test/fuzztest/stubsetpointervisible_fuzzer/BUILD.gn index c35f67d17eca126da62981d5aceff6ea14fa5532..c44bc179645f619cd998054fb4310d2710bee41a 100644 --- a/test/fuzztest/stubsetpointervisible_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsetpointervisible_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetPointerVisibleFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsetpointervisible_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsetpointervisible_fuzzer/stubsetpointervisible_fuzzer.cpp b/test/fuzztest/stubsetpointervisible_fuzzer/stubsetpointervisible_fuzzer.cpp index 93d380526ab2551fa7964f4cce488b47b7d72c88..ac08caf824ca7250356c88756d57536951c02c3b 100644 --- a/test/fuzztest/stubsetpointervisible_fuzzer/stubsetpointervisible_fuzzer.cpp +++ b/test/fuzztest/stubsetpointervisible_fuzzer/stubsetpointervisible_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubSetPointerVisibleFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubSetPointerVisibleFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_POINTER_VISIBLE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_POINTER_VISIBLE), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/BUILD.gn b/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/BUILD.gn index 606c523cf0ac97b69a27f71064a85ff32d568d03..432b90677539250e364b988cf9a6d399a908e672 100644 --- a/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetTouchpadPinchSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsettouchpadpinchswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/stubsettouchpadpinchswitch_fuzzer.cpp b/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/stubsettouchpadpinchswitch_fuzzer.cpp index 5fd23b72094916588539702ce1c834f04ce69cd9..b488b8ec2d08a5c2311ebe2dd83ca4e346d5f53a 100644 --- a/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/stubsettouchpadpinchswitch_fuzzer.cpp +++ b/test/fuzztest/stubsettouchpadpinchswitch_fuzzer/stubsettouchpadpinchswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetTouchpadPinchSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetTouchpadPinchSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_TP_PINCH_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_PINCH_SWITCH), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/BUILD.gn b/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/BUILD.gn index 51eb029d4ffd86c43113258829eb8c469e1b9b05..be6eb492839a197ce7171e2bc2e9f874158be778 100644 --- a/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetTouchpadPointerSpeedFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsettouchpadpointerspeed_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/stubsettouchpadpointerspeed_fuzzer.cpp b/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/stubsettouchpadpointerspeed_fuzzer.cpp index 6a8f2645a947fe0e9d302153d5555cf3b125645b..8c6c5c387e4ea778a58f041c2851e9198480c39a 100644 --- a/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/stubsettouchpadpointerspeed_fuzzer.cpp +++ b/test/fuzztest/stubsettouchpadpointerspeed_fuzzer/stubsettouchpadpointerspeed_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetTouchpadPointerSpeedFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,8 @@ bool StubSetTouchpadPointerSpeedFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_TP_POINTER_SPEED), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_POINTER_SPEED), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/BUILD.gn b/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/BUILD.gn index 921afaa9f9948fe26e09c7bf124412f786b731a6..3c9f33347ed142ffb571f5fcbd1926333a6dd750 100644 --- a/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetTouchpadRightClickTypeFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsettouchpadrightclicktype_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/stubsettouchpadrightclicktype_fuzzer.cpp b/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/stubsettouchpadrightclicktype_fuzzer.cpp index 6fbb3395cf138daa8c09a0ffad52a9b37a6af618..0ec7aada91873ec0c6861b9fa628817be6991bf5 100644 --- a/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/stubsettouchpadrightclicktype_fuzzer.cpp +++ b/test/fuzztest/stubsettouchpadrightclicktype_fuzzer/stubsettouchpadrightclicktype_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetTouchpadRightClickTypeFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,8 @@ bool StubSetTouchpadRightClickTypeFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_TP_RIGHT_CLICK_TYPE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_RIGHT_CLICK_TYPE), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/BUILD.gn b/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/BUILD.gn index 436f85151e221c83ea13696080b6d2d19088487e..1e6ce9cecddb79237b15da41356244ffd724da24 100644 --- a/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetTouchpadScrollDirectionFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsettouchpadscrolldirection_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/stubsettouchpadscrolldirection_fuzzer.cpp b/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/stubsettouchpadscrolldirection_fuzzer.cpp index 9abdd827abc8839ce04458ea8a4456126273b91f..355da58058afe4f0063096f0092ce598cb14c7d8 100644 --- a/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/stubsettouchpadscrolldirection_fuzzer.cpp +++ b/test/fuzztest/stubsettouchpadscrolldirection_fuzzer/stubsettouchpadscrolldirection_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetTouchpadScrollDirectionFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,8 @@ bool StubSetTouchpadScrollDirectionFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_TP_SCROLL_DIRECT_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_SCROLL_DIRECTION), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/BUILD.gn b/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/BUILD.gn index 83d51d78183fa1c1636d0946d21b0ebd30b4a929..6ecccec75ead2528e947386cf103d3bd9e548e01 100644 --- a/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetTouchpadScrollSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsettouchpadscrollswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/stubsettouchpadscrollswitch_fuzzer.cpp b/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/stubsettouchpadscrollswitch_fuzzer.cpp index 0bb01af536d5997c64921deed28ca4336eda3405..05b7b9d84f3e8b3e131c78f648a52008dcc7496b 100644 --- a/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/stubsettouchpadscrollswitch_fuzzer.cpp +++ b/test/fuzztest/stubsettouchpadscrollswitch_fuzzer/stubsettouchpadscrollswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetTouchpadScrollSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,8 @@ bool StubSetTouchpadScrollSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_TP_SCROLL_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_SCROLL_SWITCH), + datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/BUILD.gn b/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/BUILD.gn index 34efb2f4294e63fc09164ab17ddcd792afa267b0..34a1d044cf104fba172dca3914ad149c03c312b4 100644 --- a/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSetTouchpadSwipeSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsettouchpadswipeswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/stubsettouchpadswipeswitch_fuzzer.cpp b/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/stubsettouchpadswipeswitch_fuzzer.cpp index 2eb32a4f223bfb4d3fd415c362c50e64ff7d66cf..628462ff82d549486888b3fa263e6c8d9874ee40 100644 --- a/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/stubsettouchpadswipeswitch_fuzzer.cpp +++ b/test/fuzztest/stubsettouchpadswipeswitch_fuzzer/stubsettouchpadswipeswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetTouchpadSwipeSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetTouchpadSwipeSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_TP_SWIPE_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_SWIPE_SWITCH), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsettouchpadtapswitch_fuzzer/BUILD.gn b/test/fuzztest/stubsettouchpadtapswitch_fuzzer/BUILD.gn index 5c9e390527459267bd80ba499bd2a29f4bd0eb53..9fc86d5dbe7b19001ccab5cae8854768233128a5 100644 --- a/test/fuzztest/stubsettouchpadtapswitch_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsettouchpadtapswitch_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSetTouchpadTapSwitchFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsettouchpadtapswitch_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsettouchpadtapswitch_fuzzer/stubsettouchpadtapswitch_fuzzer.cpp b/test/fuzztest/stubsettouchpadtapswitch_fuzzer/stubsettouchpadtapswitch_fuzzer.cpp index cd89a80747c4c742c4549ec31513b1754ff6563a..a196f03825bb84442fbc86f50720d91502fa396a 100644 --- a/test/fuzztest/stubsettouchpadtapswitch_fuzzer/stubsettouchpadtapswitch_fuzzer.cpp +++ b/test/fuzztest/stubsettouchpadtapswitch_fuzzer/stubsettouchpadtapswitch_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSetTouchpadTapSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSetTouchpadTapSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MMI::MultimodalinputConnectInterfaceCode::SET_TP_TAP_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_TAP_SWITCH), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsubscribekeyevent_fuzzer/BUILD.gn b/test/fuzztest/stubsubscribekeyevent_fuzzer/BUILD.gn index 6aa38fa12cc6afdf28e68621abfaf5f80c0db93c..500440089304cb80631ab93075c46efd689ca54e 100644 --- a/test/fuzztest/stubsubscribekeyevent_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsubscribekeyevent_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSubscribeKeyEventFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsubscribekeyevent_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsubscribekeyevent_fuzzer/stubsubscribekeyevent_fuzzer.cpp b/test/fuzztest/stubsubscribekeyevent_fuzzer/stubsubscribekeyevent_fuzzer.cpp index 6766152d26b801ce7f45c265324e6a52dfb08f46..9582313ccb60194ddaf6d10c331afa73a26121db 100644 --- a/test/fuzztest/stubsubscribekeyevent_fuzzer/stubsubscribekeyevent_fuzzer.cpp +++ b/test/fuzztest/stubsubscribekeyevent_fuzzer/stubsubscribekeyevent_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubSubscribeKeyEventFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubSubscribeKeyEventFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SUBSCRIBE_KEY_EVENT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SUBSCRIBE_KEY_EVENT), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubsubscribeswitchevent_fuzzer/BUILD.gn b/test/fuzztest/stubsubscribeswitchevent_fuzzer/BUILD.gn index 8613e5d3a95d64662e32d8a1f00b5af4935d90c1..15236be523323f6e72eafb4e0e4d35d98978e6e1 100644 --- a/test/fuzztest/stubsubscribeswitchevent_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsubscribeswitchevent_fuzzer/BUILD.gn @@ -51,6 +51,13 @@ ohos_fuzztest("StubSubscribeSwitchEventFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsubscribeswitchevent_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsubscribeswitchevent_fuzzer/stubsubscribeswitchevent_fuzzer.cpp b/test/fuzztest/stubsubscribeswitchevent_fuzzer/stubsubscribeswitchevent_fuzzer.cpp index ca4f98aa247329aeb7ad8df4027309491541c841..9b469b039d2943605562177bec5a9bea23fdc304 100644 --- a/test/fuzztest/stubsubscribeswitchevent_fuzzer/stubsubscribeswitchevent_fuzzer.cpp +++ b/test/fuzztest/stubsubscribeswitchevent_fuzzer/stubsubscribeswitchevent_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { bool StubSubscribeSwitchEventFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -38,7 +38,7 @@ bool StubSubscribeSwitchEventFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SUBSCRIBE_SWITCH_EVENT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SUBSCRIBE_SWITCH_EVENT), datas, reply, option); return true; } } // namespace OHOS diff --git a/test/fuzztest/stubsupportkeys_fuzzer/BUILD.gn b/test/fuzztest/stubsupportkeys_fuzzer/BUILD.gn index 9a72202c90f7bd5ded77751b8f3f61b1ced9329c..31582a8497f3458a7a47a68a0b6c5aa360b0a3ee 100644 --- a/test/fuzztest/stubsupportkeys_fuzzer/BUILD.gn +++ b/test/fuzztest/stubsupportkeys_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubSupportKeysFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubsupportkeys_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubsupportkeys_fuzzer/stubsupportkeys_fuzzer.cpp b/test/fuzztest/stubsupportkeys_fuzzer/stubsupportkeys_fuzzer.cpp index 424aed5e8e6bc694d1b507b36b9eda9f8c815905..4b523387aaf808770897baa2b74bfd125bd7ba6e 100644 --- a/test/fuzztest/stubsupportkeys_fuzzer/stubsupportkeys_fuzzer.cpp +++ b/test/fuzztest/stubsupportkeys_fuzzer/stubsupportkeys_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubSupportKeysFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubSupportKeysFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SUPPORT_KEYS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SUPPORT_KEYS), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/BUILD.gn b/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/BUILD.gn index e629f3210f88bf9d2ee55801ff967707a7d39816..8afe79be3a6b780559d96705924199a6da32fa1b 100644 --- a/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/BUILD.gn +++ b/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/BUILD.gn @@ -53,6 +53,13 @@ ohos_fuzztest("StubUnregisterInputDeviceMonitorFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubunregisterinputdevicemonitor_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/stubunregisterinputdevicemonitor_fuzzer.cpp b/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/stubunregisterinputdevicemonitor_fuzzer.cpp index 66a533a3ec17a409c04ee6c5dd7283f98136dc07..8074ee73a6f5dd73de187cd2b2b00e585f4a8105 100644 --- a/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/stubunregisterinputdevicemonitor_fuzzer.cpp +++ b/test/fuzztest/stubunregisterinputdevicemonitor_fuzzer/stubunregisterinputdevicemonitor_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubUnregisterInputDeviceMonitorFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubUnregisterInputDeviceMonitorFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::UNREGISTER_DEV_MONITOR), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_UNREGISTER_DEV_LISTENER), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubunsubscribekeyevent_fuzzer/BUILD.gn b/test/fuzztest/stubunsubscribekeyevent_fuzzer/BUILD.gn index 7e3c32ed028914d201918913039ac56b095181dc..cca87e310ba88640bdfefb8426f10b7009197304 100644 --- a/test/fuzztest/stubunsubscribekeyevent_fuzzer/BUILD.gn +++ b/test/fuzztest/stubunsubscribekeyevent_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubUnsubscribeKeyEventFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubunsubscribekeyevent_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubunsubscribekeyevent_fuzzer/stubunsubscribekeyevent_fuzzer.cpp b/test/fuzztest/stubunsubscribekeyevent_fuzzer/stubunsubscribekeyevent_fuzzer.cpp index df4cc6d46f012a4fc765068603e07513b2d35871..6406cc9cd823665b042b2b66602df6fd4b0fb29b 100644 --- a/test/fuzztest/stubunsubscribekeyevent_fuzzer/stubunsubscribekeyevent_fuzzer.cpp +++ b/test/fuzztest/stubunsubscribekeyevent_fuzzer/stubunsubscribekeyevent_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace MMI { -const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; +const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; bool StubUnsubscribeKeyEventFuzzTest(const uint8_t *data, size_t size) { @@ -38,7 +38,7 @@ bool StubUnsubscribeKeyEventFuzzTest(const uint8_t *data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::UNSUBSCRIBE_KEY_EVENT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_UNSUBSCRIBE_KEY_EVENT), datas, reply, option); return true; } } // namespace MMI diff --git a/test/fuzztest/stubunsubscribeswitchevent_fuzzer/BUILD.gn b/test/fuzztest/stubunsubscribeswitchevent_fuzzer/BUILD.gn index 92d9830a6d0259769731417804d6a8f4f4c48001..7ba874ea605bebc080ed9ada2feff5351e0e2272 100644 --- a/test/fuzztest/stubunsubscribeswitchevent_fuzzer/BUILD.gn +++ b/test/fuzztest/stubunsubscribeswitchevent_fuzzer/BUILD.gn @@ -52,6 +52,13 @@ ohos_fuzztest("StubUnsubscribeSwitchEventFuzzTest") { "-Dprivate=public", "-Dprotected=public", ] + + configs = [ + "${mmi_path}/service/filter:mmi_event_filter_config", + "${mmi_path}/service/connect_manager:mmi_connect_manager_config", + "${mmi_path}/common/anco/comm:mmi_anco_channel_config", + ] + sources = [ "stubunsubscribeswitchevent_fuzzer.cpp" ] deps = [ diff --git a/test/fuzztest/stubunsubscribeswitchevent_fuzzer/stubunsubscribeswitchevent_fuzzer.cpp b/test/fuzztest/stubunsubscribeswitchevent_fuzzer/stubunsubscribeswitchevent_fuzzer.cpp index 8fb26bee55886e16190883a84a8f27b40ab135fe..19dd58c1714aa7328f2749eaab050d9c7d3c35b5 100644 --- a/test/fuzztest/stubunsubscribeswitchevent_fuzzer/stubunsubscribeswitchevent_fuzzer.cpp +++ b/test/fuzztest/stubunsubscribeswitchevent_fuzzer/stubunsubscribeswitchevent_fuzzer.cpp @@ -27,7 +27,7 @@ namespace MMI { namespace OHOS { bool StubUnsubscribeSwitchEventFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -37,13 +37,13 @@ bool StubUnsubscribeSwitchEventFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::UNSUBSCRIBE_SWITCH_EVENT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_UNSUBSCRIBE_SWITCH_EVENT), datas, reply, option); return true; } bool StubQuerySwitchStatusFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -53,13 +53,13 @@ bool StubQuerySwitchStatusFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::QUERY_SWITCH_STATE_EVENT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_QUERY_SWITCH_STATUS), datas, reply, option); return true; } bool StubSetTouchpadRotateSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -69,13 +69,14 @@ bool StubSetTouchpadRotateSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_TP_ROTATE_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_ROTATE_SWITCH), + datas, reply, option); return true; } bool StubGetTouchpadRotateSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -85,13 +86,14 @@ bool StubGetTouchpadRotateSwitchFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_TP_ROTATE_SWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_ROTATE_SWITCH), + datas, reply, option); return true; } bool StubGetKeyStateFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -101,13 +103,13 @@ bool StubGetKeyStateFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_KEY_STATE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_KEY_STATE), datas, reply, option); return true; } bool StubAuthorizeFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -117,13 +119,13 @@ bool StubAuthorizeFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::NATIVE_AUTHORIZE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_AUTHORIZE), datas, reply, option); return true; } bool StubCancelInjectionFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -133,13 +135,13 @@ bool StubCancelInjectionFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::NATIVE_CANCEL_INJECTION), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_CANCEL_INJECTION), datas, reply, option); return true; } bool StubHasIrEmitterFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -149,13 +151,13 @@ bool StubHasIrEmitterFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::NATIVE_INFRARED_OWN), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_HAS_IR_EMITTER), datas, reply, option); return true; } bool StubGetInfraredFrequenciesFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -165,13 +167,13 @@ bool StubGetInfraredFrequenciesFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::NATIVE_INFRARED_FREQUENCY), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_INFRARED_FREQUENCIES), datas, reply, option); return true; } bool StubTransmitInfraredFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -181,13 +183,13 @@ bool StubTransmitInfraredFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::NATIVE_CANCEL_TRANSMIT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_TRANSMIT_INFRARED), datas, reply, option); return true; } bool StubSetPixelMapDataFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -197,13 +199,13 @@ bool StubSetPixelMapDataFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_PIXEL_MAP_DATA), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_PIXEL_MAP_DATA), datas, reply, option); return true; } bool StubSetCurrentUserFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -213,13 +215,13 @@ bool StubSetCurrentUserFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_CURRENT_USERID), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_CURRENT_USER), datas, reply, option); return true; } bool StubEnableHardwareCursorStatsFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -229,14 +231,14 @@ bool StubEnableHardwareCursorStatsFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::ENABLE_HARDWARE_CURSOR_STATS), + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ENABLE_HARDWARE_CURSOR_STATS), datas, reply, option); return true; } bool StubGetHardwareCursorStatsFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -246,13 +248,13 @@ bool StubGetHardwareCursorStatsFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_HARDWARE_CURSOR_STATS), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_HARDWARE_CURSOR_STATS), datas, reply, option); return true; } bool StubAddVirtualInputDeviceFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -262,13 +264,13 @@ bool StubAddVirtualInputDeviceFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::ADD_VIRTUAL_INPUT_DEVICE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ADD_VIRTUAL_INPUT_DEVICE), datas, reply, option); return true; } bool StubRemoveVirtualInputDeviceFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -278,13 +280,14 @@ bool StubRemoveVirtualInputDeviceFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::REMOVE_VIRTUAL_INPUT_DEVICE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_REMOVE_VIRTUAL_INPUT_DEVICE), + datas, reply, option); return true; } bool StubTransferBinderClientServiceFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -294,7 +297,7 @@ bool StubTransferBinderClientServiceFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::TRANSFER_BINDER_CLIENT_SERVICE), + static_cast(IMultimodalInputConnectIpcCode::COMMAND_TRANSFER_BINDER_CLIENT_SRV), datas, reply, option); return true; } @@ -302,7 +305,7 @@ bool StubTransferBinderClientServiceFuzzTest(const uint8_t* data, size_t size) #ifdef OHOS_BUILD_ENABLE_MAGICCURSOR bool StubGetPointerSnapshotFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -312,14 +315,14 @@ bool StubGetPointerSnapshotFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_POINTER_SNAPSHOT), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::GET_POINTER_SNAPSHOT), datas, reply, option); return true; } #endif // OHOS_BUILD_ENABLE_MAGICCURSOR bool StubSkipPointerLayerFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -329,13 +332,13 @@ bool StubSkipPointerLayerFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SKIP_POINTER_LAYER), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SKIP_POINTER_LAYER), datas, reply, option); return true; } bool StubMarkEventConsumedFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -345,13 +348,13 @@ bool StubMarkEventConsumedFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::MARK_EVENT_CONSUMED), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_MARK_EVENT_CONSUMED), datas, reply, option); return true; } bool StubGetDeviceFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -361,13 +364,13 @@ bool StubGetDeviceFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_DEVICE), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_DEVICE), datas, reply, option); return true; } bool StubSetTouchpadThreeFingersTapSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -377,13 +380,14 @@ bool StubSetTouchpadThreeFingersTapSwitchFuzzTest(const uint8_t* data, size_t si MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::SET_THREE_GINGERS_TAPSWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_SET_TOUCHPAD_THREE_FINGERS_TAP_SWITCH), + datas, reply, option); return true; } bool StubGetTouchpadThreeFingersTapSwitchFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -393,14 +397,15 @@ bool StubGetTouchpadThreeFingersTapSwitchFuzzTest(const uint8_t* data, size_t si MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::GET_THREE_GINGERS_TAPSWITCH), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_GET_TOUCHPAD_THREE_FINGERS_TAP_SWITCH), + datas, reply, option); return true; } #ifdef OHOS_BUILD_ENABLE_ANCO bool StubAncoAddChannelFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -410,13 +415,13 @@ bool StubAncoAddChannelFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::ADD_ANCO_CHANNEL), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ANCO_ADD_CHANNEL), datas, reply, option); return true; } bool StubAncoRemoveChannelFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) { @@ -426,14 +431,14 @@ bool StubAncoRemoveChannelFuzzTest(const uint8_t* data, size_t size) MessageOption option; MMIService::GetInstance()->state_ = ServiceRunningState::STATE_RUNNING; MMIService::GetInstance()->OnRemoteRequest( - static_cast(MultimodalinputConnectInterfaceCode::REMOVE_ANCO_CHANNEL), datas, reply, option); + static_cast(IMultimodalInputConnectIpcCode::COMMAND_ANCO_REMOVE_CHANNEL), datas, reply, option); return true; } #endif // OHOS_BUILD_ENABLE_ANCO bool switchDefaultFuzzTest(const uint8_t* data, size_t size) { - const std::u16string FORMMGR_INTERFACE_TOKEN { u"ohos.multimodalinput.IConnectManager" }; + const std::u16string FORMMGR_INTERFACE_TOKEN { u"OHOS.MMI.IMultimodalInputConnect" }; MessageParcel datas; if (!datas.WriteInterfaceToken(FORMMGR_INTERFACE_TOKEN) || !datas.WriteBuffer(data, size) || !datas.RewindRead(0)) {