From fde75f591c2031b8e9d4345a09d97e2bf246b990 Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Fri, 15 Jul 2022 18:48:34 +0800 Subject: [PATCH 01/10] Signed-off-by: ma-shaoyin Changes to be committed: --- etc/para/include/para_handle.h | 4 +++- etc/para/src/para_handle.cpp | 3 +++ .../include/input_method_agent_proxy.h | 10 +++++++++- .../src/input_method_agent_proxy.cpp | 2 ++ .../include/input_client_proxy.h | 9 ++++++++- .../include/input_client_stub.h | 9 +++++++-- .../include/input_data_channel_proxy.h | 10 ++++++++-- .../include/input_data_channel_stub.h | 8 ++++++-- .../src/input_client_proxy.cpp | 4 ++++ .../src/input_client_stub.cpp | 7 +++++++ .../src/input_data_channel_proxy.cpp | 5 ++++- .../src/input_data_channel_stub.cpp | 9 ++++++++- services/dfx/include/inputmethod_dump.h | 13 +++++++------ services/dfx/include/inputmethod_sysevent.h | 4 ++-- services/dfx/include/inputmethod_trace.h | 3 ++- services/dfx/src/inputmethod_dump.cpp | 8 ++++++++ services/dfx/src/inputmethod_sysevent.cpp | 6 ++++-- services/include/input_attribute.h | 4 +++- services/include/input_method_property.h | 10 ++++++---- services/include/keyboard_type.h | 2 +- services/include/message.h | 5 +++-- services/include/message_handler.h | 5 +---- services/src/input_attribute.cpp | 2 ++ services/src/input_method_property.cpp | 5 +++++ services/src/keyboard_type.cpp | 4 ++++ services/src/message.cpp | 2 ++ services/src/message_handler.cpp | 3 +++ 27 files changed, 122 insertions(+), 34 deletions(-) diff --git a/etc/para/include/para_handle.h b/etc/para/include/para_handle.h index d45fd3d..58c238c 100644 --- a/etc/para/include/para_handle.h +++ b/etc/para/include/para_handle.h @@ -15,7 +15,9 @@ #ifndef ETC_PARA_INCLUDE_PARA_HANDLE_H #define ETC_PARA_INCLUDE_PARA_HANDLE_H -#include +//#include +#include +#include "iosfwd" namespace OHOS { namespace MiscServices { class ParaHandle { diff --git a/etc/para/src/para_handle.cpp b/etc/para/src/para_handle.cpp index 5d4ec40..43278a5 100644 --- a/etc/para/src/para_handle.cpp +++ b/etc/para/src/para_handle.cpp @@ -12,8 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + #include "para_handle.h" #include "parameter.h" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h index 568eb0b..34c8f1d 100644 --- a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h +++ b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h @@ -16,8 +16,16 @@ #ifndef FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H #define FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H -#include "iremote_proxy.h" +#include +#include "functional" #include "i_input_method_agent.h" +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" +#include "message_parcel.h" +#include "nocopyable.h" +#include "refbase.h" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp b/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp index 357d2f5..96afcca 100644 --- a/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp +++ b/frameworks/inputmethod_ability/src/input_method_agent_proxy.cpp @@ -14,6 +14,8 @@ */ #include "input_method_agent_proxy.h" +#include "global.h" +#include "message_option.h" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/include/input_client_proxy.h b/frameworks/inputmethod_controller/include/input_client_proxy.h index fc1fcc4..1089402 100644 --- a/frameworks/inputmethod_controller/include/input_client_proxy.h +++ b/frameworks/inputmethod_controller/include/input_client_proxy.h @@ -17,8 +17,15 @@ #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H -#include "iremote_proxy.h" +#include +#include "functional" #include "i_input_client.h" +#include "i_input_method_agent.h" +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" +#include "nocopyable.h" +#include "refbase.h" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/include/input_client_stub.h b/frameworks/inputmethod_controller/include/input_client_stub.h index 5ccc71e..d5b3bde 100644 --- a/frameworks/inputmethod_controller/include/input_client_stub.h +++ b/frameworks/inputmethod_controller/include/input_client_stub.h @@ -17,10 +17,15 @@ #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H -#include "iremote_stub.h" +#include #include "i_input_client.h" +#include "i_input_method_agent.h" +#include "iremote_stub.h" #include "message_handler.h" -#include "message.h" +#include "message_option.h" +#include "message_parcel.h" +#include "nocopyable.h" +#include "refbase.h" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h index 5d26ae6..e3edc62 100644 --- a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h +++ b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h @@ -16,9 +16,15 @@ #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H -#include "iremote_proxy.h" +#include +#include "functional" #include "i_input_data_channel.h" -#include "input_method_utils.h" +#include "iremote_broker.h" +#include "iremote_object.h" +#include "iremote_proxy.h" +#include "nocopyable.h" +#include "refbase.h" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/include/input_data_channel_stub.h b/frameworks/inputmethod_controller/include/input_data_channel_stub.h index 68e1bba..ba75c95 100644 --- a/frameworks/inputmethod_controller/include/input_data_channel_stub.h +++ b/frameworks/inputmethod_controller/include/input_data_channel_stub.h @@ -17,11 +17,15 @@ #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H +#include #include "i_input_data_channel.h" #include "iremote_stub.h" #include "message_handler.h" -#include "input_method_utils.h" -#include "input_method_controller.h" +#include "message_option.h" +#include "message_parcel.h" +#include "nocopyable.h" +#include "refbase.h" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_client_proxy.cpp b/frameworks/inputmethod_controller/src/input_client_proxy.cpp index d3c6a03..89a2579 100644 --- a/frameworks/inputmethod_controller/src/input_client_proxy.cpp +++ b/frameworks/inputmethod_controller/src/input_client_proxy.cpp @@ -13,7 +13,11 @@ * limitations under the License. */ + #include "input_client_proxy.h" +#include "global.h" +#include "message_option.h" +#include "message_parcel.h" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_client_stub.cpp b/frameworks/inputmethod_controller/src/input_client_stub.cpp index 3db66b9..03e4774 100644 --- a/frameworks/inputmethod_controller/src/input_client_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_client_stub.cpp @@ -13,8 +13,15 @@ * limitations under the License. */ + #include "input_client_stub.h" +#include #include "global.h" +#include "ipc_object_stub.h" +#include "ipc_types.h" +#include "message.h" +#include "new" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp b/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp index 860410b..a840c09 100644 --- a/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp +++ b/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp @@ -13,9 +13,12 @@ * limitations under the License. */ + #include "input_data_channel_proxy.h" +#include "global.h" +#include "ipc_types.h" +#include "message_option.h" #include "message_parcel.h" -#include "utils.h" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp index 47a1a1e..b27269d 100644 --- a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp @@ -13,8 +13,15 @@ * limitations under the License. */ + #include "input_data_channel_stub.h" -#include "string_ex.h" +#include +#include "global.h" +#include "input_method_controller.h" +#include "ipc_object_stub.h" +#include "ipc_types.h" +#include "message.h" +#include "new" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/include/inputmethod_dump.h b/services/dfx/include/inputmethod_dump.h index 466dbfa..0d3f8a7 100644 --- a/services/dfx/include/inputmethod_dump.h +++ b/services/dfx/include/inputmethod_dump.h @@ -16,12 +16,13 @@ #ifndef INPUTMETHOD_DUMP_H #define INPUTMETHOD_DUMP_H -#include -#include -#include -#include -#include -#include "singleton.h" +#include +#include +#include +#include +#include "__mutex_base" +#include "iosfwd" +#include "singleton.h" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/include/inputmethod_sysevent.h b/services/dfx/include/inputmethod_sysevent.h index bc54ef5..81a8cf2 100644 --- a/services/dfx/include/inputmethod_sysevent.h +++ b/services/dfx/include/inputmethod_sysevent.h @@ -16,8 +16,8 @@ #ifndef INPUTMETHOD_SYSEVENT_H #define INPUTMETHOD_SYSEVENT_H -#include -#include "global.h" +#include +#include "iosfwd" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/include/inputmethod_trace.h b/services/dfx/include/inputmethod_trace.h index 9ca2ac3..bcbee7b 100644 --- a/services/dfx/include/inputmethod_trace.h +++ b/services/dfx/include/inputmethod_trace.h @@ -16,7 +16,8 @@ #ifndef INPUTMETHOD_TRACE_H #define INPUTMETHOD_TRACE_H -#include +#include +#include "iosfwd" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/src/inputmethod_dump.cpp b/services/dfx/src/inputmethod_dump.cpp index db04fa6..f142b9c 100644 --- a/services/dfx/src/inputmethod_dump.cpp +++ b/services/dfx/src/inputmethod_dump.cpp @@ -13,8 +13,16 @@ * limitations under the License. */ +// #include "inputmethod_dump.h" +// #include "global.h" #include "inputmethod_dump.h" +#include +#include "functional" #include "global.h" +#include "list" +#include "stdio.h" +#include "string" +#include "vector" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/src/inputmethod_sysevent.cpp b/services/dfx/src/inputmethod_sysevent.cpp index 51970ee..9846ce2 100644 --- a/services/dfx/src/inputmethod_sysevent.cpp +++ b/services/dfx/src/inputmethod_sysevent.cpp @@ -13,9 +13,11 @@ * limitations under the License. */ -#include "inputmethod_sysevent.h" -#include "hisysevent.h" +#include "inputmethod_sysevent.h" +#include "global.h" +#include "hisysevent.h" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/services/include/input_attribute.h b/services/include/input_attribute.h index b6b39b4..b336d2e 100644 --- a/services/include/input_attribute.h +++ b/services/include/input_attribute.h @@ -15,7 +15,9 @@ #ifndef SERVICES_INCLUDE_INPUT_ATTRIBUTE_H #define SERVICES_INCLUDE_INPUT_ATTRIBUTE_H -#include "parcel.h" + +#include +#include "parcel.h" namespace OHOS { namespace MiscServices { diff --git a/services/include/input_method_property.h b/services/include/input_method_property.h index 8602692..3c67950 100644 --- a/services/include/input_method_property.h +++ b/services/include/input_method_property.h @@ -15,10 +15,12 @@ #ifndef SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H #define SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H -#include -#include -#include "parcel.h" -#include "keyboard_type.h" + +#include +#include +#include +#include "keyboard_type.h" +#include "parcel.h" namespace OHOS { namespace MiscServices { diff --git a/services/include/keyboard_type.h b/services/include/keyboard_type.h index 7344362..7e54901 100644 --- a/services/include/keyboard_type.h +++ b/services/include/keyboard_type.h @@ -16,7 +16,7 @@ #ifndef SERVICES_INCLUDE_KEYBOARD_TYPE_H #define SERVICES_INCLUDE_KEYBOARD_TYPE_H -#include +#include #include #include "parcel.h" diff --git a/services/include/message.h b/services/include/message.h index 5038e1a..748690f 100644 --- a/services/include/message.h +++ b/services/include/message.h @@ -17,8 +17,9 @@ #ifndef SERVICES_INCLUDE_MESSAGE_H #define SERVICES_INCLUDE_MESSAGE_H -#include "global.h" -#include "message_parcel.h" +#include +#include "message_parcel.h" + namespace OHOS { namespace MiscServices { class Message { diff --git a/services/include/message_handler.h b/services/include/message_handler.h index 9ab10d6..2aca460 100644 --- a/services/include/message_handler.h +++ b/services/include/message_handler.h @@ -18,10 +18,7 @@ #define SERVICES_INCLUDE_MESSAGE_HANDLER_H #include -#include -#include -#include "global.h" -#include "message_parcel.h" +#include "__mutex_base" #include "message.h" namespace OHOS { diff --git a/services/src/input_attribute.cpp b/services/src/input_attribute.cpp index 8d9119a..87b3376 100644 --- a/services/src/input_attribute.cpp +++ b/services/src/input_attribute.cpp @@ -13,7 +13,9 @@ * limitations under the License. */ + #include "input_attribute.h" +#include "new" namespace OHOS { namespace MiscServices { diff --git a/services/src/input_method_property.cpp b/services/src/input_method_property.cpp index 53bd881..a368837 100644 --- a/services/src/input_method_property.cpp +++ b/services/src/input_method_property.cpp @@ -13,7 +13,12 @@ * limitations under the License. */ + #include "input_method_property.h" +#include "__config" +#include "new" +#include "string" +#include "vector" namespace OHOS { namespace MiscServices { diff --git a/services/src/keyboard_type.cpp b/services/src/keyboard_type.cpp index 45402a7..5d6d021 100644 --- a/services/src/keyboard_type.cpp +++ b/services/src/keyboard_type.cpp @@ -13,7 +13,11 @@ * limitations under the License. */ + #include "keyboard_type.h" +#include "__config" +#include "new" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/services/src/message.cpp b/services/src/message.cpp index 1713e45..e0c28a6 100644 --- a/services/src/message.cpp +++ b/services/src/message.cpp @@ -13,7 +13,9 @@ * limitations under the License. */ + #include "message.h" +#include "new" namespace OHOS { namespace MiscServices { diff --git a/services/src/message_handler.cpp b/services/src/message_handler.cpp index fe5ad2a..635dd56 100644 --- a/services/src/message_handler.cpp +++ b/services/src/message_handler.cpp @@ -13,7 +13,10 @@ * limitations under the License. */ + #include "message_handler.h" +#include "new" +#include "queue" namespace OHOS { namespace MiscServices { From f8f56ad3cf9ff6bc670dbcbaba208e8de1e9c0aa Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Fri, 15 Jul 2022 18:49:56 +0800 Subject: [PATCH 02/10] Signed-off-by: ma-shaoyin Changes to be committed: --- etc/para/include/para_handle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/para/include/para_handle.h b/etc/para/include/para_handle.h index 58c238c..a137d27 100644 --- a/etc/para/include/para_handle.h +++ b/etc/para/include/para_handle.h @@ -15,7 +15,7 @@ #ifndef ETC_PARA_INCLUDE_PARA_HANDLE_H #define ETC_PARA_INCLUDE_PARA_HANDLE_H -//#include + #include #include "iosfwd" namespace OHOS { From 13feea4d0e71a92c2a7f588d5bc9207f0a52989e Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Fri, 15 Jul 2022 19:05:41 +0800 Subject: [PATCH 03/10] Signed-off-by: ma-shaoyin Changes to be committed: --- etc/para/include/para_handle.h | 5 +++-- .../include/input_method_agent_proxy.h | 3 ++- services/dfx/include/inputmethod_dump.h | 15 ++++++++------- services/dfx/include/inputmethod_sysevent.h | 5 +++-- services/dfx/include/inputmethod_trace.h | 2 +- services/dfx/src/inputmethod_dump.cpp | 7 +++---- services/dfx/src/inputmethod_sysevent.cpp | 8 ++++---- services/include/input_attribute.h | 5 +++-- services/include/input_method_property.h | 12 +++++++----- services/include/message.h | 5 +++-- services/src/input_attribute.cpp | 4 ++-- 11 files changed, 39 insertions(+), 32 deletions(-) diff --git a/etc/para/include/para_handle.h b/etc/para/include/para_handle.h index a137d27..73a9ccb 100644 --- a/etc/para/include/para_handle.h +++ b/etc/para/include/para_handle.h @@ -16,8 +16,9 @@ #ifndef ETC_PARA_INCLUDE_PARA_HANDLE_H #define ETC_PARA_INCLUDE_PARA_HANDLE_H -#include -#include "iosfwd" +#include + +#include "iosfwd" namespace OHOS { namespace MiscServices { class ParaHandle { diff --git a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h index 34c8f1d..f5cc835 100644 --- a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h +++ b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h @@ -16,7 +16,8 @@ #ifndef FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H #define FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H -#include +#include + #include "functional" #include "i_input_method_agent.h" #include "iremote_broker.h" diff --git a/services/dfx/include/inputmethod_dump.h b/services/dfx/include/inputmethod_dump.h index 0d3f8a7..3ce8527 100644 --- a/services/dfx/include/inputmethod_dump.h +++ b/services/dfx/include/inputmethod_dump.h @@ -16,13 +16,14 @@ #ifndef INPUTMETHOD_DUMP_H #define INPUTMETHOD_DUMP_H -#include -#include -#include -#include -#include "__mutex_base" -#include "iosfwd" -#include "singleton.h" +#include +#include +#include +#include + +#include "__mutex_base" +#include "iosfwd" +#include "singleton.h" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/include/inputmethod_sysevent.h b/services/dfx/include/inputmethod_sysevent.h index 81a8cf2..cbe358d 100644 --- a/services/dfx/include/inputmethod_sysevent.h +++ b/services/dfx/include/inputmethod_sysevent.h @@ -16,8 +16,9 @@ #ifndef INPUTMETHOD_SYSEVENT_H #define INPUTMETHOD_SYSEVENT_H -#include -#include "iosfwd" +#include + +#include "iosfwd" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/include/inputmethod_trace.h b/services/dfx/include/inputmethod_trace.h index bcbee7b..3cadf4d 100644 --- a/services/dfx/include/inputmethod_trace.h +++ b/services/dfx/include/inputmethod_trace.h @@ -16,7 +16,7 @@ #ifndef INPUTMETHOD_TRACE_H #define INPUTMETHOD_TRACE_H -#include +#include #include "iosfwd" namespace OHOS { diff --git a/services/dfx/src/inputmethod_dump.cpp b/services/dfx/src/inputmethod_dump.cpp index f142b9c..2074dab 100644 --- a/services/dfx/src/inputmethod_dump.cpp +++ b/services/dfx/src/inputmethod_dump.cpp @@ -13,14 +13,13 @@ * limitations under the License. */ -// #include "inputmethod_dump.h" -// #include "global.h" #include "inputmethod_dump.h" -#include + +#include + #include "functional" #include "global.h" #include "list" -#include "stdio.h" #include "string" #include "vector" diff --git a/services/dfx/src/inputmethod_sysevent.cpp b/services/dfx/src/inputmethod_sysevent.cpp index 9846ce2..2c3c744 100644 --- a/services/dfx/src/inputmethod_sysevent.cpp +++ b/services/dfx/src/inputmethod_sysevent.cpp @@ -13,11 +13,11 @@ * limitations under the License. */ - #include "inputmethod_sysevent.h" -#include "global.h" -#include "hisysevent.h" -#include "string" + +#include "global.h" +#include "hisysevent.h" +#include "string" namespace OHOS { namespace MiscServices { diff --git a/services/include/input_attribute.h b/services/include/input_attribute.h index b336d2e..409efbc 100644 --- a/services/include/input_attribute.h +++ b/services/include/input_attribute.h @@ -16,8 +16,9 @@ #ifndef SERVICES_INCLUDE_INPUT_ATTRIBUTE_H #define SERVICES_INCLUDE_INPUT_ATTRIBUTE_H -#include -#include "parcel.h" +#include + +#include "parcel.h" namespace OHOS { namespace MiscServices { diff --git a/services/include/input_method_property.h b/services/include/input_method_property.h index 3c67950..1c526af 100644 --- a/services/include/input_method_property.h +++ b/services/include/input_method_property.h @@ -16,11 +16,13 @@ #ifndef SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H #define SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H -#include -#include -#include -#include "keyboard_type.h" -#include "parcel.h" +#include + +#include +#include + +#include "keyboard_type.h" +#include "parcel.h" namespace OHOS { namespace MiscServices { diff --git a/services/include/message.h b/services/include/message.h index 748690f..176eee2 100644 --- a/services/include/message.h +++ b/services/include/message.h @@ -17,8 +17,9 @@ #ifndef SERVICES_INCLUDE_MESSAGE_H #define SERVICES_INCLUDE_MESSAGE_H -#include -#include "message_parcel.h" +#include + +#include "message_parcel.h" namespace OHOS { namespace MiscServices { diff --git a/services/src/input_attribute.cpp b/services/src/input_attribute.cpp index 87b3376..85ff3e9 100644 --- a/services/src/input_attribute.cpp +++ b/services/src/input_attribute.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ - #include "input_attribute.h" -#include "new" + +#include "new" namespace OHOS { namespace MiscServices { From d116009900bb9fca1f972bbba4d3733732251093 Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Sat, 16 Jul 2022 13:37:06 +0800 Subject: [PATCH 04/10] Signed-off-by: ma-shaoyin Changes to be committed: --- etc/para/include/para_handle.h | 5 +---- etc/para/src/para_handle.cpp | 1 - frameworks/inputmethod_controller/src/input_client_stub.cpp | 1 - .../inputmethod_controller/src/input_data_channel_stub.cpp | 1 - services/dfx/include/inputmethod_sysevent.h | 5 ++--- services/dfx/include/inputmethod_trace.h | 3 +-- services/dfx/src/inputmethod_sysevent.cpp | 3 +-- 7 files changed, 5 insertions(+), 14 deletions(-) diff --git a/etc/para/include/para_handle.h b/etc/para/include/para_handle.h index 73a9ccb..d45fd3d 100644 --- a/etc/para/include/para_handle.h +++ b/etc/para/include/para_handle.h @@ -15,10 +15,7 @@ #ifndef ETC_PARA_INCLUDE_PARA_HANDLE_H #define ETC_PARA_INCLUDE_PARA_HANDLE_H - -#include - -#include "iosfwd" +#include namespace OHOS { namespace MiscServices { class ParaHandle { diff --git a/etc/para/src/para_handle.cpp b/etc/para/src/para_handle.cpp index 43278a5..3c3d955 100644 --- a/etc/para/src/para_handle.cpp +++ b/etc/para/src/para_handle.cpp @@ -16,7 +16,6 @@ #include "para_handle.h" #include "parameter.h" -#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_client_stub.cpp b/frameworks/inputmethod_controller/src/input_client_stub.cpp index 03e4774..0509b2e 100644 --- a/frameworks/inputmethod_controller/src/input_client_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_client_stub.cpp @@ -15,7 +15,6 @@ #include "input_client_stub.h" -#include #include "global.h" #include "ipc_object_stub.h" #include "ipc_types.h" diff --git a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp index b27269d..b27d137 100644 --- a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp @@ -15,7 +15,6 @@ #include "input_data_channel_stub.h" -#include #include "global.h" #include "input_method_controller.h" #include "ipc_object_stub.h" diff --git a/services/dfx/include/inputmethod_sysevent.h b/services/dfx/include/inputmethod_sysevent.h index cbe358d..bc54ef5 100644 --- a/services/dfx/include/inputmethod_sysevent.h +++ b/services/dfx/include/inputmethod_sysevent.h @@ -16,9 +16,8 @@ #ifndef INPUTMETHOD_SYSEVENT_H #define INPUTMETHOD_SYSEVENT_H -#include - -#include "iosfwd" +#include +#include "global.h" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/include/inputmethod_trace.h b/services/dfx/include/inputmethod_trace.h index 3cadf4d..9ca2ac3 100644 --- a/services/dfx/include/inputmethod_trace.h +++ b/services/dfx/include/inputmethod_trace.h @@ -16,8 +16,7 @@ #ifndef INPUTMETHOD_TRACE_H #define INPUTMETHOD_TRACE_H -#include -#include "iosfwd" +#include namespace OHOS { namespace MiscServices { diff --git a/services/dfx/src/inputmethod_sysevent.cpp b/services/dfx/src/inputmethod_sysevent.cpp index 2c3c744..f251dd9 100644 --- a/services/dfx/src/inputmethod_sysevent.cpp +++ b/services/dfx/src/inputmethod_sysevent.cpp @@ -15,9 +15,8 @@ #include "inputmethod_sysevent.h" -#include "global.h" #include "hisysevent.h" -#include "string" + namespace OHOS { namespace MiscServices { From fa3be8636840dc117889445aabcbd98cea4919b9 Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Sat, 16 Jul 2022 15:11:27 +0800 Subject: [PATCH 05/10] Signed-off-by: ma-shaoyin Changes to be committed: --- etc/para/src/para_handle.cpp | 1 - .../include/input_method_agent_proxy.h | 6 +++--- .../inputmethod_controller/include/input_client_proxy.h | 6 +++--- .../inputmethod_controller/include/input_client_stub.h | 3 +-- .../include/input_data_channel_proxy.h | 7 ++++--- .../include/input_data_channel_stub.h | 6 +++--- .../inputmethod_controller/src/input_client_proxy.cpp | 1 - .../inputmethod_controller/src/input_client_stub.cpp | 7 ++++--- .../src/input_data_channel_stub.cpp | 5 +++-- services/dfx/src/inputmethod_dump.cpp | 8 ++++---- services/dfx/src/inputmethod_sysevent.cpp | 1 - services/include/input_attribute.h | 2 +- services/include/input_method_property.h | 3 +-- services/include/keyboard_type.h | 2 +- services/include/message.h | 2 +- services/src/input_attribute.cpp | 2 +- services/src/input_method_property.cpp | 9 +++++---- services/src/keyboard_type.cpp | 7 ++++--- services/src/message_handler.cpp | 8 ++++---- 19 files changed, 43 insertions(+), 43 deletions(-) diff --git a/etc/para/src/para_handle.cpp b/etc/para/src/para_handle.cpp index 3c3d955..7dc2759 100644 --- a/etc/para/src/para_handle.cpp +++ b/etc/para/src/para_handle.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "para_handle.h" #include "parameter.h" diff --git a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h index f5cc835..d6269f6 100644 --- a/frameworks/inputmethod_ability/include/input_method_agent_proxy.h +++ b/frameworks/inputmethod_ability/include/input_method_agent_proxy.h @@ -16,9 +16,10 @@ #ifndef FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H #define FRAMEWORKS_INPUTMETHOD_ABILITY_INCLUDE_INPUT_METHOD_AGENT_PROXY_H -#include +#include +#include +#include -#include "functional" #include "i_input_method_agent.h" #include "iremote_broker.h" #include "iremote_object.h" @@ -26,7 +27,6 @@ #include "message_parcel.h" #include "nocopyable.h" #include "refbase.h" -#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/include/input_client_proxy.h b/frameworks/inputmethod_controller/include/input_client_proxy.h index 1089402..5193993 100644 --- a/frameworks/inputmethod_controller/include/input_client_proxy.h +++ b/frameworks/inputmethod_controller/include/input_client_proxy.h @@ -13,12 +13,12 @@ * limitations under the License. */ - #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_PROXY_H -#include -#include "functional" +#include +#include + #include "i_input_client.h" #include "i_input_method_agent.h" #include "iremote_broker.h" diff --git a/frameworks/inputmethod_controller/include/input_client_stub.h b/frameworks/inputmethod_controller/include/input_client_stub.h index d5b3bde..605e1dc 100644 --- a/frameworks/inputmethod_controller/include/input_client_stub.h +++ b/frameworks/inputmethod_controller/include/input_client_stub.h @@ -13,11 +13,10 @@ * limitations under the License. */ - #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_CLIENT_STUB_H -#include +#include #include "i_input_client.h" #include "i_input_method_agent.h" #include "iremote_stub.h" diff --git a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h index e3edc62..b3414c4 100644 --- a/frameworks/inputmethod_controller/include/input_data_channel_proxy.h +++ b/frameworks/inputmethod_controller/include/input_data_channel_proxy.h @@ -16,15 +16,16 @@ #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_PROXY_H -#include -#include "functional" +#include +#include +#include + #include "i_input_data_channel.h" #include "iremote_broker.h" #include "iremote_object.h" #include "iremote_proxy.h" #include "nocopyable.h" #include "refbase.h" -#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/include/input_data_channel_stub.h b/frameworks/inputmethod_controller/include/input_data_channel_stub.h index ba75c95..f4b0b0f 100644 --- a/frameworks/inputmethod_controller/include/input_data_channel_stub.h +++ b/frameworks/inputmethod_controller/include/input_data_channel_stub.h @@ -13,11 +13,12 @@ * limitations under the License. */ - #ifndef FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H #define FRAMEWORKS_INPUTMETHOD_CONTROLLER_INCLUDE_INPUT_DATA_CHANNEL_STUB_H -#include +#include +#include + #include "i_input_data_channel.h" #include "iremote_stub.h" #include "message_handler.h" @@ -25,7 +26,6 @@ #include "message_parcel.h" #include "nocopyable.h" #include "refbase.h" -#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_client_proxy.cpp b/frameworks/inputmethod_controller/src/input_client_proxy.cpp index 89a2579..4cab09f 100644 --- a/frameworks/inputmethod_controller/src/input_client_proxy.cpp +++ b/frameworks/inputmethod_controller/src/input_client_proxy.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "input_client_proxy.h" #include "global.h" #include "message_option.h" diff --git a/frameworks/inputmethod_controller/src/input_client_stub.cpp b/frameworks/inputmethod_controller/src/input_client_stub.cpp index 0509b2e..b65becf 100644 --- a/frameworks/inputmethod_controller/src/input_client_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_client_stub.cpp @@ -13,14 +13,15 @@ * limitations under the License. */ - #include "input_client_stub.h" + +#include +#include + #include "global.h" #include "ipc_object_stub.h" #include "ipc_types.h" #include "message.h" -#include "new" -#include "string" namespace OHOS { namespace MiscServices { diff --git a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp index b27d137..675d398 100644 --- a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp @@ -13,14 +13,15 @@ * limitations under the License. */ - #include "input_data_channel_stub.h" + +#include + #include "global.h" #include "input_method_controller.h" #include "ipc_object_stub.h" #include "ipc_types.h" #include "message.h" -#include "new" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/src/inputmethod_dump.cpp b/services/dfx/src/inputmethod_dump.cpp index 2074dab..c3f4fb2 100644 --- a/services/dfx/src/inputmethod_dump.cpp +++ b/services/dfx/src/inputmethod_dump.cpp @@ -16,12 +16,12 @@ #include "inputmethod_dump.h" #include +#include +#include +#include +#include -#include "functional" #include "global.h" -#include "list" -#include "string" -#include "vector" namespace OHOS { namespace MiscServices { diff --git a/services/dfx/src/inputmethod_sysevent.cpp b/services/dfx/src/inputmethod_sysevent.cpp index f251dd9..51970ee 100644 --- a/services/dfx/src/inputmethod_sysevent.cpp +++ b/services/dfx/src/inputmethod_sysevent.cpp @@ -17,7 +17,6 @@ #include "hisysevent.h" - namespace OHOS { namespace MiscServices { namespace { diff --git a/services/include/input_attribute.h b/services/include/input_attribute.h index 409efbc..27252d5 100644 --- a/services/include/input_attribute.h +++ b/services/include/input_attribute.h @@ -16,7 +16,7 @@ #ifndef SERVICES_INCLUDE_INPUT_ATTRIBUTE_H #define SERVICES_INCLUDE_INPUT_ATTRIBUTE_H -#include +#include #include "parcel.h" diff --git a/services/include/input_method_property.h b/services/include/input_method_property.h index 1c526af..c9bb675 100644 --- a/services/include/input_method_property.h +++ b/services/include/input_method_property.h @@ -16,8 +16,7 @@ #ifndef SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H #define SERVICES_INCLUDE_INPUT_METHOD_PROPERTY_H -#include - +#include #include #include diff --git a/services/include/keyboard_type.h b/services/include/keyboard_type.h index 7e54901..b58edc6 100644 --- a/services/include/keyboard_type.h +++ b/services/include/keyboard_type.h @@ -16,7 +16,7 @@ #ifndef SERVICES_INCLUDE_KEYBOARD_TYPE_H #define SERVICES_INCLUDE_KEYBOARD_TYPE_H -#include +#include #include #include "parcel.h" diff --git a/services/include/message.h b/services/include/message.h index 176eee2..c981690 100644 --- a/services/include/message.h +++ b/services/include/message.h @@ -17,7 +17,7 @@ #ifndef SERVICES_INCLUDE_MESSAGE_H #define SERVICES_INCLUDE_MESSAGE_H -#include +#include #include "message_parcel.h" diff --git a/services/src/input_attribute.cpp b/services/src/input_attribute.cpp index 85ff3e9..c0b3a21 100644 --- a/services/src/input_attribute.cpp +++ b/services/src/input_attribute.cpp @@ -15,7 +15,7 @@ #include "input_attribute.h" -#include "new" +#include namespace OHOS { namespace MiscServices { diff --git a/services/src/input_method_property.cpp b/services/src/input_method_property.cpp index a368837..46a95d8 100644 --- a/services/src/input_method_property.cpp +++ b/services/src/input_method_property.cpp @@ -13,12 +13,13 @@ * limitations under the License. */ - #include "input_method_property.h" + +#include +#include +#include + #include "__config" -#include "new" -#include "string" -#include "vector" namespace OHOS { namespace MiscServices { diff --git a/services/src/keyboard_type.cpp b/services/src/keyboard_type.cpp index 5d6d021..28bea25 100644 --- a/services/src/keyboard_type.cpp +++ b/services/src/keyboard_type.cpp @@ -13,11 +13,12 @@ * limitations under the License. */ - #include "keyboard_type.h" + +#include +#include + #include "__config" -#include "new" -#include "string" namespace OHOS { namespace MiscServices { diff --git a/services/src/message_handler.cpp b/services/src/message_handler.cpp index 635dd56..4c34fa2 100644 --- a/services/src/message_handler.cpp +++ b/services/src/message_handler.cpp @@ -13,12 +13,12 @@ * limitations under the License. */ - #include "message_handler.h" -#include "new" -#include "queue" -namespace OHOS { +#include +#include + + namespace OHOS { namespace MiscServices { /*! Constructor */ From 24626fa3e0c7ebc9830063f85acd619f8518429f Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Sat, 16 Jul 2022 15:15:01 +0800 Subject: [PATCH 06/10] Signed-off-by: ma-shaoyin Changes to be committed: --- .../inputmethod_controller/src/input_data_channel_proxy.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp b/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp index a840c09..a14e7b0 100644 --- a/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp +++ b/frameworks/inputmethod_controller/src/input_data_channel_proxy.cpp @@ -13,7 +13,6 @@ * limitations under the License. */ - #include "input_data_channel_proxy.h" #include "global.h" #include "ipc_types.h" From 2475d75b314a22ce3115632d43b4b3884b67102f Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Sat, 16 Jul 2022 15:25:16 +0800 Subject: [PATCH 07/10] Signed-off-by: ma-shaoyin Changes to be committed: --- services/src/message.cpp | 2 +- services/src/message_handler.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/src/message.cpp b/services/src/message.cpp index e0c28a6..1e09eff 100644 --- a/services/src/message.cpp +++ b/services/src/message.cpp @@ -13,9 +13,9 @@ * limitations under the License. */ +#include #include "message.h" -#include "new" namespace OHOS { namespace MiscServices { diff --git a/services/src/message_handler.cpp b/services/src/message_handler.cpp index 4c34fa2..af49c26 100644 --- a/services/src/message_handler.cpp +++ b/services/src/message_handler.cpp @@ -18,7 +18,7 @@ #include #include - namespace OHOS { +namespace OHOS { namespace MiscServices { /*! Constructor */ From 98de382f3ba83ba6def697c1a1761bbd751b7a17 Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Sat, 16 Jul 2022 15:59:04 +0800 Subject: [PATCH 08/10] Signed-off-by: ma-shaoyin Changes to be committed: --- frameworks/inputmethod_controller/src/input_client_stub.cpp | 3 --- .../inputmethod_controller/src/input_data_channel_stub.cpp | 2 -- services/src/input_attribute.cpp | 2 -- services/src/input_method_property.cpp | 4 ---- services/src/keyboard_type.cpp | 3 --- services/src/message.cpp | 2 -- services/src/message_handler.cpp | 3 --- 7 files changed, 19 deletions(-) diff --git a/frameworks/inputmethod_controller/src/input_client_stub.cpp b/frameworks/inputmethod_controller/src/input_client_stub.cpp index b65becf..3d9f12c 100644 --- a/frameworks/inputmethod_controller/src/input_client_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_client_stub.cpp @@ -15,9 +15,6 @@ #include "input_client_stub.h" -#include -#include - #include "global.h" #include "ipc_object_stub.h" #include "ipc_types.h" diff --git a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp index 675d398..92d7ddd 100644 --- a/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp +++ b/frameworks/inputmethod_controller/src/input_data_channel_stub.cpp @@ -15,8 +15,6 @@ #include "input_data_channel_stub.h" -#include - #include "global.h" #include "input_method_controller.h" #include "ipc_object_stub.h" diff --git a/services/src/input_attribute.cpp b/services/src/input_attribute.cpp index c0b3a21..8d9119a 100644 --- a/services/src/input_attribute.cpp +++ b/services/src/input_attribute.cpp @@ -15,8 +15,6 @@ #include "input_attribute.h" -#include - namespace OHOS { namespace MiscServices { /*! Constructor diff --git a/services/src/input_method_property.cpp b/services/src/input_method_property.cpp index 46a95d8..5c6b9ef 100644 --- a/services/src/input_method_property.cpp +++ b/services/src/input_method_property.cpp @@ -15,10 +15,6 @@ #include "input_method_property.h" -#include -#include -#include - #include "__config" namespace OHOS { diff --git a/services/src/keyboard_type.cpp b/services/src/keyboard_type.cpp index 28bea25..e4c7f07 100644 --- a/services/src/keyboard_type.cpp +++ b/services/src/keyboard_type.cpp @@ -15,9 +15,6 @@ #include "keyboard_type.h" -#include -#include - #include "__config" namespace OHOS { diff --git a/services/src/message.cpp b/services/src/message.cpp index 1e09eff..1713e45 100644 --- a/services/src/message.cpp +++ b/services/src/message.cpp @@ -13,8 +13,6 @@ * limitations under the License. */ -#include - #include "message.h" namespace OHOS { diff --git a/services/src/message_handler.cpp b/services/src/message_handler.cpp index af49c26..fe5ad2a 100644 --- a/services/src/message_handler.cpp +++ b/services/src/message_handler.cpp @@ -15,9 +15,6 @@ #include "message_handler.h" -#include -#include - namespace OHOS { namespace MiscServices { /*! Constructor From 845d416df9aa5d04ee17184e5c86cbde9f8f5741 Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Sat, 16 Jul 2022 16:53:09 +0800 Subject: [PATCH 09/10] Signed-off-by: ma-shaoyin Changes to be committed: --- services/dfx/include/inputmethod_dump.h | 2 +- services/include/message_handler.h | 3 ++- services/src/input_method_property.cpp | 2 -- services/src/keyboard_type.cpp | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/services/dfx/include/inputmethod_dump.h b/services/dfx/include/inputmethod_dump.h index 3ce8527..07218a8 100644 --- a/services/dfx/include/inputmethod_dump.h +++ b/services/dfx/include/inputmethod_dump.h @@ -16,12 +16,12 @@ #ifndef INPUTMETHOD_DUMP_H #define INPUTMETHOD_DUMP_H +#include #include #include #include #include -#include "__mutex_base" #include "iosfwd" #include "singleton.h" diff --git a/services/include/message_handler.h b/services/include/message_handler.h index 2aca460..20ae260 100644 --- a/services/include/message_handler.h +++ b/services/include/message_handler.h @@ -17,8 +17,9 @@ #ifndef SERVICES_INCLUDE_MESSAGE_HANDLER_H #define SERVICES_INCLUDE_MESSAGE_HANDLER_H +#include +#include #include -#include "__mutex_base" #include "message.h" namespace OHOS { diff --git a/services/src/input_method_property.cpp b/services/src/input_method_property.cpp index 5c6b9ef..53bd881 100644 --- a/services/src/input_method_property.cpp +++ b/services/src/input_method_property.cpp @@ -15,8 +15,6 @@ #include "input_method_property.h" -#include "__config" - namespace OHOS { namespace MiscServices { using namespace std; diff --git a/services/src/keyboard_type.cpp b/services/src/keyboard_type.cpp index e4c7f07..45402a7 100644 --- a/services/src/keyboard_type.cpp +++ b/services/src/keyboard_type.cpp @@ -15,8 +15,6 @@ #include "keyboard_type.h" -#include "__config" - namespace OHOS { namespace MiscServices { using namespace std; From 722b73dc8d6146ee51e26922ba3dab49a6c9721c Mon Sep 17 00:00:00 2001 From: ma-shaoyin Date: Sat, 16 Jul 2022 17:17:44 +0800 Subject: [PATCH 10/10] Signed-off-by: ma-shaoyin Changes to be committed: --- services/include/message_handler.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/include/message_handler.h b/services/include/message_handler.h index 20ae260..9ab10d6 100644 --- a/services/include/message_handler.h +++ b/services/include/message_handler.h @@ -17,9 +17,11 @@ #ifndef SERVICES_INCLUDE_MESSAGE_HANDLER_H #define SERVICES_INCLUDE_MESSAGE_HANDLER_H -#include -#include #include +#include +#include +#include "global.h" +#include "message_parcel.h" #include "message.h" namespace OHOS {