From 5e7934d463a79f693900260a94ccb08fafde7e9b Mon Sep 17 00:00:00 2001 From: Dragon51 Date: Fri, 18 Apr 2025 14:44:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E8=BE=93=E5=85=A5IDL?= =?UTF-8?q?=E5=8C=96=E6=8B=86=E5=88=86002=5Ffuzztest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Dragon51 --- .../fuzztest/cleanwindowstyle_fuzzer/BUILD.gn | 7 ++ .../cleanwindowstyle_fuzzer.cpp | 5 +- .../fuzztest/enablecombinekey_fuzzer/BUILD.gn | 7 ++ .../enablecombinekey_fuzzer.cpp | 4 +- .../getallnapstatusdata_fuzzer/BUILD.gn | 7 ++ .../getallnapstatusdata_fuzzer.cpp | 5 +- .../getkeyboardrepeatdelay_fuzzer/BUILD.gn | 7 ++ .../getkeyboardrepeatdelay_fuzzer.cpp | 4 +- .../getkeyboardrepeatrate_fuzzer/BUILD.gn | 7 ++ .../getkeyboardrepeatrate_fuzzer.cpp | 4 +- test/fuzztest/getpointercolor_fuzzer/BUILD.gn | 7 ++ .../getpointercolor_fuzzer.cpp | 4 +- test/fuzztest/getpointersize_fuzzer/BUILD.gn | 7 ++ .../getpointersize_fuzzer.cpp | 4 +- test/fuzztest/getshieldstatus_fuzzer/BUILD.gn | 7 ++ .../getshieldstatus_fuzzer.cpp | 4 +- .../gettprightclicktype_fuzzer/BUILD.gn | 7 ++ .../gettprightclicktype_fuzzer.cpp | 5 +- test/fuzztest/injectevent_fuzzer/BUILD.gn | 7 ++ test/fuzztest/notifynaponline_fuzzer/BUILD.gn | 7 ++ .../notifynaponline_fuzzer.cpp | 4 +- .../removeinputeventobserver_fuzzer/BUILD.gn | 7 ++ .../removeinputeventobserver_fuzzer.cpp | 5 +- .../setcustomcursor_fuzzer.cpp | 5 +- test/fuzztest/setmousehotspot_fuzzer/BUILD.gn | 7 ++ .../setmousehotspot_fuzzer.cpp | 4 +- test/fuzztest/setnapstatus_fuzzer/BUILD.gn | 7 ++ .../setnapstatus_fuzzer.cpp | 4 +- test/fuzztest/setpointercolor_fuzzer/BUILD.gn | 7 ++ .../setpointercolor_fuzzer.cpp | 4 +- test/fuzztest/setpointersize_fuzzer/BUILD.gn | 7 ++ .../setpointersize_fuzzer.cpp | 4 +- test/fuzztest/setshieldstatus_fuzzer/BUILD.gn | 7 ++ .../setshieldstatus_fuzzer.cpp | 4 +- .../shiftapppointerevent_fuzzer/BUILD.gn | 7 ++ .../stubaddinputeventfilter_fuzzer/BUILD.gn | 7 ++ .../stubaddinputeventfilter_fuzzer.cpp | 4 +- .../stubaddinputhandler_fuzzer/BUILD.gn | 7 ++ .../stubaddinputhandler_fuzzer.cpp | 4 +- .../stubappendextradata_fuzzer/BUILD.gn | 7 ++ .../stubappendextradata_fuzzer.cpp | 4 +- .../stubenableinputdevice_fuzzer/BUILD.gn | 7 ++ .../stubenableinputdevice_fuzzer.cpp | 4 +- .../fuzztest/stubgetdeviceids_fuzzer/BUILD.gn | 7 ++ .../stubgetdeviceids_fuzzer.cpp | 4 +- .../stubgetdisplaybindinfo_fuzzer/BUILD.gn | 7 ++ .../stubgetdisplaybindinfo_fuzzer.cpp | 4 +- .../stubgetfunctionkeystate_fuzzer/BUILD.gn | 7 ++ .../stubgetfunctionkeystate_fuzzer.cpp | 4 +- .../stubgethoverscrollstate_fuzzer/BUILD.gn | 7 ++ .../stubgethoverscrollstate_fuzzer.cpp | 4 +- .../stubgetkeyboardtype_fuzzer/BUILD.gn | 7 ++ .../stubgetkeyboardtype_fuzzer.cpp | 4 +- .../stubgetmouseprimarybutton_fuzzer/BUILD.gn | 7 ++ .../stubgetmouseprimarybutton_fuzzer.cpp | 4 +- .../stubgetmousescrollrows_fuzzer/BUILD.gn | 7 ++ .../stubgetmousescrollrows_fuzzer.cpp | 4 +- .../stubgetpointersnapshot_fuzzer/BUILD.gn | 7 ++ .../stubgetpointersnapshot_fuzzer.cpp | 4 +- .../stubgetpointerspeed_fuzzer/BUILD.gn | 7 ++ .../stubgetpointerspeed_fuzzer.cpp | 4 +- .../stubgetpointerstyle_fuzzer/BUILD.gn | 7 ++ .../stubgetpointerstyle_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubgettouchpadpinchswitch_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubgettouchpadpointerspeed_fuzzer.cpp | 5 +- .../BUILD.gn | 7 ++ .../stubgettouchpadscrolldirection_fuzzer.cpp | 5 +- .../BUILD.gn | 7 ++ .../stubgettouchpadscrollswitch_fuzzer.cpp | 5 +- .../BUILD.gn | 7 ++ .../stubgettouchpadswipeswitch_fuzzer.cpp | 4 +- .../stubgettouchpadtapswitch_fuzzer/BUILD.gn | 7 ++ .../stubgettouchpadtapswitch_fuzzer.cpp | 4 +- .../fuzztest/stubgetwindowpid_fuzzer/BUILD.gn | 7 ++ .../stubgetwindowpid_fuzzer.cpp | 4 +- .../stubhandleallocsocketfd_fuzzer/BUILD.gn | 8 ++ .../stubhandleallocsocketfd_fuzzer.cpp | 39 +++++-- .../stubinjectkeyevent_fuzzer/BUILD.gn | 7 ++ .../stubinjectkeyevent_fuzzer.cpp | 4 +- .../stubinjectpointerevent_fuzzer/BUILD.gn | 7 ++ .../stubinjectpointerevent_fuzzer.cpp | 4 +- .../stubispointervisible_fuzzer/BUILD.gn | 7 ++ .../stubispointervisible_fuzzer.cpp | 4 +- .../stubmarkprocessed_fuzzer/BUILD.gn | 7 ++ .../stubmarkprocessed_fuzzer.cpp | 4 +- .../stubmovemouseevent_fuzzer/BUILD.gn | 7 ++ .../stubmovemouseevent_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubregisterinputdevicemonitor_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubremoveinputeventfilter_fuzzer.cpp | 4 +- .../stubremoveinputhandler_fuzzer/BUILD.gn | 7 ++ .../stubremoveinputhandler_fuzzer.cpp | 4 +- .../stubsetanrlistener_fuzzer/BUILD.gn | 7 ++ .../stubsetanrlistener_fuzzer.cpp | 4 +- .../stubsetdisplaybind_fuzzer/BUILD.gn | 7 ++ .../stubsetdisplaybind_fuzzer.cpp | 4 +- .../stubsetfunctionkeystate_fuzzer/BUILD.gn | 7 ++ .../stubsetfunctionkeystate_fuzzer.cpp | 4 +- .../stubsethoverscrollstate_fuzzer/BUILD.gn | 7 ++ .../stubsethoverscrollstate_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubsetkeyboardrepeatdelay_fuzzer.cpp | 4 +- .../stubsetkeyboardrepeatrate_fuzzer/BUILD.gn | 7 ++ .../stubsetkeyboardrepeatrate_fuzzer.cpp | 4 +- .../stubsetkeydownduration_fuzzer/BUILD.gn | 7 ++ .../stubsetkeydownduration_fuzzer.cpp | 4 +- .../stubsetmousecapturemode_fuzzer/BUILD.gn | 7 ++ .../stubsetmousecapturemode_fuzzer.cpp | 4 +- .../stubsetmouseicon_fuzzer.cpp | 4 +- .../stubsetmouseprimarybutton_fuzzer/BUILD.gn | 7 ++ .../stubsetmouseprimarybutton_fuzzer.cpp | 4 +- .../stubsetmousescrollrows_fuzzer/BUILD.gn | 7 ++ .../stubsetmousescrollrows_fuzzer.cpp | 4 +- .../stubsetpointerlocation_fuzzer/BUILD.gn | 7 ++ .../stubsetpointerlocation_fuzzer.cpp | 4 +- .../stubsetpointerspeed_fuzzer/BUILD.gn | 7 ++ .../stubsetpointerspeed_fuzzer.cpp | 4 +- .../stubsetpointerstyle_fuzzer/BUILD.gn | 7 ++ .../stubsetpointerstyle_fuzzer.cpp | 4 +- .../stubsetpointervisible_fuzzer/BUILD.gn | 7 ++ .../stubsetpointervisible_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubsettouchpadpinchswitch_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubsettouchpadpointerspeed_fuzzer.cpp | 5 +- .../BUILD.gn | 7 ++ .../stubsettouchpadrightclicktype_fuzzer.cpp | 5 +- .../BUILD.gn | 7 ++ .../stubsettouchpadscrolldirection_fuzzer.cpp | 5 +- .../BUILD.gn | 7 ++ .../stubsettouchpadscrollswitch_fuzzer.cpp | 5 +- .../BUILD.gn | 7 ++ .../stubsettouchpadswipeswitch_fuzzer.cpp | 4 +- .../stubsettouchpadtapswitch_fuzzer/BUILD.gn | 7 ++ .../stubsettouchpadtapswitch_fuzzer.cpp | 4 +- .../stubsubscribekeyevent_fuzzer/BUILD.gn | 7 ++ .../stubsubscribekeyevent_fuzzer.cpp | 4 +- .../stubsubscribeswitchevent_fuzzer/BUILD.gn | 7 ++ .../stubsubscribeswitchevent_fuzzer.cpp | 4 +- test/fuzztest/stubsupportkeys_fuzzer/BUILD.gn | 7 ++ .../stubsupportkeys_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ ...tubunregisterinputdevicemonitor_fuzzer.cpp | 4 +- .../stubunsubscribekeyevent_fuzzer/BUILD.gn | 7 ++ .../stubunsubscribekeyevent_fuzzer.cpp | 4 +- .../BUILD.gn | 7 ++ .../stubunsubscribeswitchevent_fuzzer.cpp | 107 +++++++++--------- 150 files changed, 767 insertions(+), 209 deletions(-) diff --git a/test/fuzztest/cleanwindowstyle_fuzzer/BUILD.gn b/test/fuzztest/cleanwindowstyle_fuzzer/BUILD.gn index 606856bdd8..1e3252ad0f 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 0d6fdd495b..c6d07985e0 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 e4eae3bb22..f6b69914a9 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 ad3a63a969..5e7d3ea977 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 3849a2eaac..7662814813 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 494d5217b8..a05d33dc7a 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 a08198922d..a3d145466c 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 3996b4b5ea..dd127a17ac 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 ef93cb548d..5b9caa6818 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 8ee3d61277..f725c7c91f 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 64f50a6de9..ffef016caf 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 8a708d8ab9..b48031ef1a 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 c23640453c..60fd8384a8 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 d69882aa35..5b6ff0eb3f 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 5d95b67864..8d4e37d461 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 b34b410f66..cd36a8d8fd 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 beeb79fa4a..cb4a71b7a5 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 22933e3040..489e411796 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 645c064ef9..e3b2c0b352 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 a0b2453a08..f13c4d0fd1 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 72964189d3..75320e7e0c 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 0120a51791..ea98b68053 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 a15034c796..80ba83c484 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 264c4903cc..f7a23b40cf 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 bc6bbdf804..e5a3879296 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 30f719ca72..a9802a3bd6 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 c8b431c91e..731d3a94eb 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 c087bdab37..14a5461464 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 226799902d..07c0d73168 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 d211f8cb6c..9cff2ad5e9 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 c99fbfdf18..da3ca39779 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 ea9caffdfe..5d80d9987e 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 da4ef52834..86ebce9024 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 4b3eb47018..52e60537ca 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 00fb0d8f05..66fe960985 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 549de248b8..a6a0848881 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 8015bf119c..fc50ddf1c8 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 f69bf68aad..80f56d0693 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 947b43de6d..a4bf0c5c62 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 407997bc14..fc5a9027e0 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 82a5fbc8ca..caae5513f2 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 9a476bdf02..5543ba0343 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 1546e04c05..278e17c7c7 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 f8133c3dd2..27639f3492 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 9d70e909b6..397edc7c52 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 186d687297..ff78292be7 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 314b99b8cd..67b0cbdd18 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 f333c808e7..39c53c590d 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 9eedb59594..255c112201 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 70303212f3..aafa32047f 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 9553eba9df..5ead204dc5 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 c2afb2f07a..0919f46879 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 c3b8e2b39e..dd76cefe7a 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 83f7ed19d4..ed13ebdb12 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 07aa53e052..b3c3e41bcd 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 27a1106cd0..79c4b6e7bd 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 acb4f1364e..2c7e079873 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 44473261cd..1c53ff21fc 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 7ed12f0770..3e93eedd8a 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 f882849b56..9751373281 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 9b0590c0e4..8ae8f750f2 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 26ad148f6d..c41b4b64bd 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 a33c598c76..b7dce6555b 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 1b1b475ae1..ac127ec042 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 4592555c65..f0084de650 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 fb430baf72..f9e1a9ddfb 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 59bb8c2e8d..7216a81615 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 3d2d5efbc5..5ead2cec97 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 d1bad508bf..9388119598 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 3cf60cc668..e1fa09f873 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 906622f98b..9711aefd54 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 1115e30625..f20c49356e 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 18fa7372d1..598aba0450 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 8b1627e23e..f3cc7950fb 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 9e1d74614b..175368d532 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 794835c606..028ae895be 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 df40684867..9983abe2eb 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 0e1bf736e8..35bae98409 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 db11aaa974..c3d66aa3e3 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 84d76eb1d6..217d644af4 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 cae1ea6976..e217c36f87 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 880af2b822..8867511bb1 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 7b3f098258..7f4691a16e 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 67922add8a..3d1bbbc73e 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 6c619d5840..dfee91e346 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 ce0180fd7a..f3df0c3e8b 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 a4dd7c3c3b..850f3dcd6a 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 b357213dc7..a3c17f6385 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 757dbbf3b0..982c713e6f 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 702fcde26c..ef7f878fe7 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 95840b41b1..1233bbb0f8 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 7eb32ee78b..46ad17ff98 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 d194d935eb..4232137e2f 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 e00e2030ee..2777306536 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 1af5a14a3d..00c0299dd3 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 adaa1dd904..f97acf9c59 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 493252cee6..7a81d5030e 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 5845b16fe1..338c285a88 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 3509e8289a..cdbacb73ca 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 a100afb76e..e976db47b7 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 982f90e382..65a78d9687 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 7528bc9f2b..b7569bb4bb 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 3bef3c59b7..835887c628 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 1a006f91eb..2794d873cf 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 47b22cf247..c1bc51a552 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 cd2ab94513..189019b078 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 f32e318b93..2b9e9f3f43 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 b2d2baab94..5c56663c70 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 43c988a076..63e6dba3f0 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 c1156b8479..1aa008e191 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 099fabe18a..680934a5b4 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 0eb8fa20df..1a0bc9b303 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 5312b0d80d..0980aa8578 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 1a74ca1a87..551ef4c612 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 dadc862498..7c99c39f3f 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 006fa30056..fe27c4c6c8 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 23dff80da1..7b05bf0223 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 388129cd4f..225cb2656c 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 be81612478..569763279e 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 4ba4c9299a..29f91cec03 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 d122e320ff..264c09ce5c 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 51924e513f..ca71fe374e 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 c35f67d17e..c44bc17964 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 93d380526a..ac08caf824 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 606c523cf0..432b906775 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 5fd23b7209..b488b8ec2d 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 51eb029d4f..be6eb49283 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 6a8f2645a9..8c6c5c387e 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 921afaa9f9..3c9f33347e 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 6fbb3395cf..0ec7aada91 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 436f85151e..1e6ce9cecd 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 9abdd827ab..355da58058 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 83d51d7818..6ecccec75e 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 0bb01af536..05b7b9d84f 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 34efb2f429..34a1d044cf 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 2eb32a4f22..628462ff82 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 5c9e390527..9fc86d5dbe 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 cd89a80747..a196f03825 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 6aa38fa12c..5004400893 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 6766152d26..9582313ccb 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 8613e5d3a9..15236be523 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 ca4f98aa24..9b469b039d 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 9a72202c90..31582a8497 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 424aed5e8e..4b523387aa 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 e629f3210f..8afe79be3a 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 66a533a3ec..8074ee73a6 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 7e3c32ed02..cca87e310b 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 df4cc6d46f..6406cc9cd8 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 92d9830a6d..7ba874ea60 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 8fb26bee55..19dd58c171 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)) { -- Gitee