diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 85905a2205db779199407877f8e9f5ece7111f56..418469dd9c0466bd08abdacd3d71b229e0a754c4 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -71,22 +71,13 @@ ohos_shared_library("libmiscdevice_service") { ] external_deps = [ - "ability_base:want", - "ability_base:zuri", "ability_runtime:app_manager", - "ability_runtime:dataobs_manager", "access_token:libaccesstoken_sdk", - "access_token:libprivacy_sdk", "access_token:libtokenid_sdk", "cJSON:cjson", - "c_utils:utils", - "common_event_service:cesfwk_innerkits", "data_share:datashare_consumer", "hilog:libhilog", - "ipc:ipc_single", - "json:nlohmann_json_static", "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] if (miscdevice_feature_vibrator_input_method_enable) { @@ -194,22 +185,13 @@ ohos_static_library("libmiscdevice_service_static") { ] external_deps = [ - "ability_base:want", - "ability_base:zuri", "ability_runtime:app_manager", - "ability_runtime:dataobs_manager", "access_token:libaccesstoken_sdk", - "access_token:libprivacy_sdk", "access_token:libtokenid_sdk", "cJSON:cjson", - "c_utils:utils", - "common_event_service:cesfwk_innerkits", "data_share:datashare_consumer", "hilog:libhilog", - "ipc:ipc_single", - "json:nlohmann_json_static", "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] if (miscdevice_feature_vibrator_input_method_enable) { diff --git a/services/miscdevice_service/haptic_matcher/include/custom_vibration_matcher.h b/services/miscdevice_service/haptic_matcher/include/custom_vibration_matcher.h index 15c2367cde07c12ae2b0cae63d1ac80e6ace1210..1df08ede061e439a92c1aa62fdaf11569dff1a3b 100644 --- a/services/miscdevice_service/haptic_matcher/include/custom_vibration_matcher.h +++ b/services/miscdevice_service/haptic_matcher/include/custom_vibration_matcher.h @@ -17,12 +17,8 @@ #define CUSTOM_VIBRATION_MATCHER_H #include -#include -#include -#include #include "i_vibrator_hdi_connection.h" -#include "vibrator_infos.h" namespace OHOS { namespace Sensors { diff --git a/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp b/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp index 06a38e862e9569dc5b65507a970f42b0652a42f0..27967db2fea1c5802bed7a7f4ff11c99ba9a01da 100644 --- a/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp +++ b/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp @@ -15,8 +15,6 @@ #include "custom_vibration_matcher.h" -#include - #include "sensors_errors.h" #include "vibrator_hdi_connection.h" diff --git a/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h b/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h index 369f3c1e46e93232260d153007da8e3f71486572..954c274c95999ea5a11d64167734e0f60fdb3bd6 100644 --- a/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h +++ b/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h @@ -16,7 +16,6 @@ #ifndef DIRECT_CONNECTION_H #define DIRECT_CONNECTION_H -#include #include #include "i_vibrator_hdi_connection.h" diff --git a/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h b/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h index 9f0839a0efa4839c9d70305ae66ad2a4e54ac166..012c711ba5f097acc7aa6f24a3dd44065a32769a 100644 --- a/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h +++ b/services/miscdevice_service/hdi_connection/adapter/include/compatible_light_connection.h @@ -16,10 +16,7 @@ #ifndef COMPATIBLE_LIGHT_CONNECTION_H #define COMPATIBLE_LIGHT_CONNECTION_H -#include -#include #include -#include #include "i_light_hdi_connection.h" namespace OHOS { diff --git a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp index eb4d1ef560ede1d68dd561d3283c8bea39d5e5b3..ebecb241396ba09cc051336abddda5729e5a9ced 100644 --- a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp @@ -14,11 +14,7 @@ */ #include "compatible_connection.h" -#include -#include #include -#include -#include #include "sensors_errors.h" diff --git a/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp index 8c56d38dc0167fcf73d4c69e2b673f19d123a05a..52ce7ffc94e32db9cd80c9f0de119a0e5f072c43 100644 --- a/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adapter/src/compatible_light_connection.cpp @@ -14,10 +14,6 @@ */ #include "compatible_light_connection.h" -#include -#include -#include - #include "sensors_errors.h" #undef LOG_TAG diff --git a/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp index f5c915394edf1274c7cb807b6f601128235c2b03..12ba4b782fc979972e892f55f3c0dd2322c01d9b 100644 --- a/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adapter/src/hdi_light_connection.cpp @@ -15,15 +15,8 @@ #include "hdi_light_connection.h" -#include -#include #include -#include -#ifdef HIVIEWDFX_HISYSEVENT_ENABLE -#include "hisysevent.h" -#endif // HIVIEWDFX_HISYSEVENT_ENABLE -#include "v1_0/light_interface_proxy.h" #include "sensors_errors.h" #undef LOG_TAG diff --git a/services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h index d0e7bc88940ee9233c581c7d046d7348da8b177e..728f96ab4f4dbb9e5bdb74307e7b3decbdc32f52 100644 --- a/services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/interface/include/i_light_hdi_connection.h @@ -16,10 +16,6 @@ #ifndef I_LIGHT_HDI_CONNECTION_H #define I_LIGHT_HDI_CONNECTION_H -#include -#include -#include - #include "light_agent_type.h" #include "light_animation_ipc.h" #include "light_info_ipc.h" diff --git a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h index d47587fe8460f3b62c77afc3110901959dd33a51..008b3dbc116653b03daf86675a4f3c5ef107edd1 100644 --- a/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/interface/include/i_vibrator_hdi_connection.h @@ -16,13 +16,7 @@ #ifndef I_VIBRATOR_HDI_CONNECTION_H #define I_VIBRATOR_HDI_CONNECTION_H -#include -#include -#include - -#include #ifdef HDF_DRIVERS_INTERFACE_VIBRATOR -#include "v1_2/vibrator_types.h" #include "v1_3/ivibrator_interface.h" #endif // HDF_DRIVERS_INTERFACE_VIBRATOR #include "vibrator_infos.h" diff --git a/services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h b/services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h index e8a57b223c9ae07be214a71423f7e4c534fbc886..95e6a5feeab40e393bf2ee396365f727b5b85864 100644 --- a/services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/interface/include/light_hdi_connection.h @@ -16,8 +16,6 @@ #ifndef LIGHT_HDI_CONNECTION_H #define LIGHT_HDI_CONNECTION_H -#include - #include "i_light_hdi_connection.h" #include "singleton.h" diff --git a/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp b/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp index 2c4abfc0d56e228674dda66a7859bbb679857c9f..df79cf38395e53f99b0185a058df604b214d6a05 100644 --- a/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/interface/src/light_hdi_connection.cpp @@ -14,8 +14,6 @@ */ #include "light_hdi_connection.h" -#include - #include "compatible_light_connection.h" #ifdef HDF_DRIVERS_INTERFACE_LIGHT #include "hdi_light_connection.h" diff --git a/services/miscdevice_service/include/miscdevice_common_event_subscriber.h b/services/miscdevice_service/include/miscdevice_common_event_subscriber.h index 9f5defaaaf5bdb64f976f1ed1ebfa72a1eaea249..6297c2a0eaac41af33cf13caa47abc9ad1541ab4 100644 --- a/services/miscdevice_service/include/miscdevice_common_event_subscriber.h +++ b/services/miscdevice_service/include/miscdevice_common_event_subscriber.h @@ -16,9 +16,6 @@ #ifndef MISCDEVICE_COMMON_EVENT_SUBSCRIBER_H #define MISCDEVICE_COMMON_EVENT_SUBSCRIBER_H -#include - -#include "common_event_data.h" #include "common_event_subscriber.h" namespace OHOS { diff --git a/services/miscdevice_service/include/miscdevice_dump.h b/services/miscdevice_service/include/miscdevice_dump.h index 741eb74b49ac73499941582a91243593ac876173..9b2ebe0ccdb690c15fb15f53d3008dab9f3dd9d3 100644 --- a/services/miscdevice_service/include/miscdevice_dump.h +++ b/services/miscdevice_service/include/miscdevice_dump.h @@ -20,7 +20,6 @@ #include "singleton.h" -#include "nocopyable.h" #include "vibrator_infos.h" namespace OHOS { diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index 403cb21894b380bb5e0f8953d9db2d05d1c99ab5..0a4b53111628898ebc99bd7243c4733be31891d2 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -16,30 +16,16 @@ #ifndef MISCDEVICE_SERVICE_H #define MISCDEVICE_SERVICE_H -#include -#include -#include -#include -#include -#include - #include "accesstoken_kit.h" #include "common_event_manager.h" -#include "nocopyable.h" #include "system_ability.h" -#include "thread_ex.h" -#include "want.h" -#include "file_utils.h" -#include "json_parser.h" #include "light_hdi_connection.h" #include "miscdevice_common.h" #include "miscdevice_common_event_subscriber.h" #include "miscdevice_delayed_sp_singleton.h" #include "miscdevice_dump.h" #include "miscdevice_service_stub.h" -#include "vibrator_hdi_connection.h" -#include "vibrator_infos.h" #include "vibrator_thread.h" namespace OHOS { diff --git a/services/miscdevice_service/include/vibration_priority_manager.h b/services/miscdevice_service/include/vibration_priority_manager.h index de5819d396237f22385ba6d0b0a9fed185853f42..8b477ac5b4408af68be10287a207507fd4157c04 100644 --- a/services/miscdevice_service/include/vibration_priority_manager.h +++ b/services/miscdevice_service/include/vibration_priority_manager.h @@ -16,18 +16,10 @@ #ifndef VIBRATION_PRIORITY_MANAGER_H #define VIBRATION_PRIORITY_MANAGER_H -#include -#include -#include -#include - #include "app_mgr_client.h" #include "datashare_helper.h" -#include "iremote_object.h" -#include "singleton.h" #include "miscdevice_observer.h" -#include "vibrator_infos.h" #include "vibrator_thread.h" namespace OHOS { diff --git a/services/miscdevice_service/include/vibrator_thread.h b/services/miscdevice_service/include/vibrator_thread.h index 404bb944eacf609517e8cf348746258b630cb06f..14d5c02fa1ac672b5f27b9a555da3f6b5d7fe489 100644 --- a/services/miscdevice_service/include/vibrator_thread.h +++ b/services/miscdevice_service/include/vibrator_thread.h @@ -16,14 +16,11 @@ #ifndef VIBRATOR_THREAD_H #define VIBRATOR_THREAD_H -#include -#include #include #include "thread_ex.h" #include "vibrator_hdi_connection.h" -#include "vibrator_infos.h" namespace OHOS { namespace Sensors { diff --git a/services/miscdevice_service/src/miscdevice_dump.cpp b/services/miscdevice_service/src/miscdevice_dump.cpp index dd64617ea73369ce43d1f42e8f6d22d037459e0a..37522c95ee5e0b4a5e4556f0abad6c93aaa77ae4 100644 --- a/services/miscdevice_service/src/miscdevice_dump.cpp +++ b/services/miscdevice_service/src/miscdevice_dump.cpp @@ -17,9 +17,6 @@ #include -#include -#include -#include #include #include "securec.h" diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index f66028d35a7353c1405242049c6fd71bb81e1f9b..eb5b44d0a188b62fa7a6d1648ff07cbcc0acd4eb 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -15,16 +15,11 @@ #include "miscdevice_service.h" -#include -#include -#include - #include "death_recipient_template.h" #ifdef HIVIEWDFX_HISYSEVENT_ENABLE #include "hisysevent.h" #endif // HIVIEWDFX_HISYSEVENT_ENABLE #ifdef MEMMGR_ENABLE -#include "iservice_registry.h" #include "mem_mgr_client.h" #endif // MEMMGR_ENABLE #include "system_ability_definition.h" @@ -37,10 +32,7 @@ #endif // HDF_DRIVERS_INTERFACE_LIGHT #ifdef OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM -#include "parameters.h" #include "permission_util.h" -#include "default_vibrator_decoder.h" -#include "default_vibrator_decoder_factory.h" #include "vibrator_decoder_creator.h" #endif // OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM diff --git a/services/miscdevice_service/src/vibration_priority_manager.cpp b/services/miscdevice_service/src/vibration_priority_manager.cpp index 4625e42997250d9e4cd61f4ec464fb27bc24c374..7ad56f9d58d6e457d4b9d3ef8c092bef8b89b7d5 100644 --- a/services/miscdevice_service/src/vibration_priority_manager.cpp +++ b/services/miscdevice_service/src/vibration_priority_manager.cpp @@ -24,12 +24,10 @@ #include "ipc_skeleton.h" #include "iservice_registry.h" #include "system_ability_definition.h" -#include "uri.h" #ifdef OHOS_BUILD_ENABLE_VIBRATOR_INPUT_METHOD #include "bundle_mgr_client.h" #include "os_account_manager.h" -#include "running_process_info.h" #endif // OHOS_BUILD_ENABLE_VIBRATOR_INPUT_METHOD #include "sensors_errors.h" diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 4501b3c169b9fe0809d892396bf74d66318848f8..71226809b08b469a78b1b3747e3848f3b69e4426 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -17,7 +17,6 @@ import("./../miscdevice.gni") group("miscdevice_utils_target") { deps = [ "common:libmiscdevice_utils", - "haptic_decoder/he_json:libhe_vibrator_decoder", "haptic_decoder/oh_json:libvibrator_decoder", ] } diff --git a/utils/common/BUILD.gn b/utils/common/BUILD.gn index 88a39816de3e26f59944fade2047dce8b0275fb9..2f2b6268987fbf4016a77d591b1dbba8fc3e35eb 100644 --- a/utils/common/BUILD.gn +++ b/utils/common/BUILD.gn @@ -49,7 +49,6 @@ ohos_shared_library("libmiscdevice_utils") { external_deps = [ "access_token:libaccesstoken_sdk", - "bounds_checking_function:libsec_shared", "cJSON:cjson", "c_utils:utils", "hilog:libhilog", diff --git a/utils/common/include/file_utils.h b/utils/common/include/file_utils.h index 274a34bc6d97425271e5abc7605a6f7c04bbd277..80c2b2d12cd34f4753ad0264dca15f8b3613715d 100755 --- a/utils/common/include/file_utils.h +++ b/utils/common/include/file_utils.h @@ -16,12 +16,8 @@ #ifndef MISCDEVICE_FILE_UTILS_H #define MISCDEVICE_FILE_UTILS_H -#include -#include #include -#include - #include "raw_file_descriptor.h" namespace OHOS { diff --git a/utils/common/include/json_parser.h b/utils/common/include/json_parser.h index 093e559ee6c1f126504f5afb6a02c27f041785bc..875b80e4d5c41d9de78624c55d542fce3897f319 100755 --- a/utils/common/include/json_parser.h +++ b/utils/common/include/json_parser.h @@ -16,8 +16,6 @@ #ifndef MISCDEVICE_JSON_PARSER_H #define MISCDEVICE_JSON_PARSER_H -#include -#include #include #include "cJSON.h" diff --git a/utils/common/include/light_info_ipc.h b/utils/common/include/light_info_ipc.h index 100e191bc9fc0c7605cc360c6930728b456d24e7..9bf0ecf968d840a00166cfc17b0d7b3ddbd195db 100644 --- a/utils/common/include/light_info_ipc.h +++ b/utils/common/include/light_info_ipc.h @@ -16,8 +16,6 @@ #ifndef LIGHT_INFO_IPC_H #define LIGHT_INFO_IPC_H -#include - #include "parcel.h" namespace OHOS { diff --git a/utils/common/include/miscdevice_common.h b/utils/common/include/miscdevice_common.h index 4a71ec5d6448416aae944de5340769feffdb3b17..9f697773b165e90c0cebe965cbf1013c0ddf05f0 100755 --- a/utils/common/include/miscdevice_common.h +++ b/utils/common/include/miscdevice_common.h @@ -16,9 +16,6 @@ #ifndef MISCDEVICE_COMMON_H #define MISCDEVICE_COMMON_H -#include -#include - namespace OHOS { namespace Sensors { // These LightId correspond to logical lights diff --git a/utils/common/include/miscdevice_delayed_sp_singleton.h b/utils/common/include/miscdevice_delayed_sp_singleton.h index 49fa02cfac866fe618311a8a772c3c5414d958f7..b6b4b976662d39b29beb43988bd6c217c918bd2c 100644 --- a/utils/common/include/miscdevice_delayed_sp_singleton.h +++ b/utils/common/include/miscdevice_delayed_sp_singleton.h @@ -16,11 +16,6 @@ #ifndef MISCDEVICE_DELAYED_SP_SINGLETON_H #define MISCDEVICE_DELAYED_SP_SINGLETON_H -#include -#include -#include -#include "nocopyable.h" - namespace OHOS { namespace Sensors { #define MISCDEVICE_DECLARE_DELAYED_SP_SINGLETON(MyClass) \ diff --git a/utils/common/include/miscdevice_log.h b/utils/common/include/miscdevice_log.h index e194505b6e266b06995153eb2db4809170669d53..c30cd61fb30e79af835e2ceff8cbc32c705b4c4a 100755 --- a/utils/common/include/miscdevice_log.h +++ b/utils/common/include/miscdevice_log.h @@ -15,10 +15,7 @@ #ifndef MISCDEVICE_LOG_H #define MISCDEVICE_LOG_H -#include "hilog/log.h" - #include "sensors_errors.h" -#include "miscdevice_log.h" #undef LOG_DOMAIN #define LOG_DOMAIN 0xD002701 diff --git a/utils/common/include/permission_util.h b/utils/common/include/permission_util.h index 74668287efdbc1ce5ce27dcc426e4b25e6cf59d2..234d475bd8c6db496997e0de8c4e2fdec31b6ec0 100644 --- a/utils/common/include/permission_util.h +++ b/utils/common/include/permission_util.h @@ -16,11 +16,7 @@ #ifndef PERMISSION_UTIL_H #define PERMISSION_UTIL_H -#include -#include -#include #include "accesstoken_kit.h" -#include "refbase.h" #include "singleton.h" namespace OHOS { diff --git a/utils/common/include/raw_file_descriptor.h b/utils/common/include/raw_file_descriptor.h index 54a84bd38fd7ff38bd8d11e5335813c25e881cb6..50df291caeeb39f5bbe6075ada8940524f4f2954 100644 --- a/utils/common/include/raw_file_descriptor.h +++ b/utils/common/include/raw_file_descriptor.h @@ -16,8 +16,6 @@ #ifndef RAW_FILE_DESCRIPTOR #define RAW_FILE_DESCRIPTOR -#include - namespace OHOS { namespace Sensors { struct RawFileDescriptor { diff --git a/utils/common/include/vibrator_infos.h b/utils/common/include/vibrator_infos.h index 6302516fb00e89d57c6c61554184c08aafbc8497..140d3c290def85b668221aa90833d379e032343c 100644 --- a/utils/common/include/vibrator_infos.h +++ b/utils/common/include/vibrator_infos.h @@ -16,10 +16,6 @@ #ifndef VIBRATOR_INFOS_H #define VIBRATOR_INFOS_H -#include -#include -#include - #include "parcel.h" namespace OHOS { namespace Sensors { diff --git a/utils/common/src/file_utils.cpp b/utils/common/src/file_utils.cpp index c580128013f12c6b2e8729047ca2934683944deb..26400bf5f29381bd1cebc6f8ebba1bf0258ed098 100755 --- a/utils/common/src/file_utils.cpp +++ b/utils/common/src/file_utils.cpp @@ -14,7 +14,6 @@ */ #include "file_utils.h" -#include #include #include #include diff --git a/utils/common/src/json_parser.cpp b/utils/common/src/json_parser.cpp index c6acb2fa3c65b3b5cd98605dc24227ad55cc5cec..ba5ce272027b42c73847b9e77a70e69a13906a0c 100755 --- a/utils/common/src/json_parser.cpp +++ b/utils/common/src/json_parser.cpp @@ -14,10 +14,6 @@ */ #include "json_parser.h" -#include -#include -#include - #include "file_utils.h" #include "sensors_errors.h" diff --git a/utils/common/src/permission_util.cpp b/utils/common/src/permission_util.cpp index 2fdbd52697c763dd958fab507fbb739be954479f..d5f49d460bb3092e589c0d95483b8e70accfc567 100644 --- a/utils/common/src/permission_util.cpp +++ b/utils/common/src/permission_util.cpp @@ -15,8 +15,6 @@ #include "permission_util.h" -#include "sensors_errors.h" - namespace OHOS { namespace Sensors { diff --git a/utils/common/src/vibrator_infos.cpp b/utils/common/src/vibrator_infos.cpp index 4b3eaeef809f5b02270b3124c2e510d90be71296..e373e0a82e19f65b22b4e26c01ed93bfcc16d07b 100644 --- a/utils/common/src/vibrator_infos.cpp +++ b/utils/common/src/vibrator_infos.cpp @@ -14,12 +14,6 @@ */ #include "vibrator_infos.h" -#include -#include - -#include -#include - #include "sensors_errors.h" #undef LOG_TAG diff --git a/utils/haptic_decoder/he_json/BUILD.gn b/utils/haptic_decoder/he_json/BUILD.gn index 83df7f59fcc37520eb789a39b154d3dd96b9a568..cbf086ab771d086059d5228807d9b894e3d7261f 100644 --- a/utils/haptic_decoder/he_json/BUILD.gn +++ b/utils/haptic_decoder/he_json/BUILD.gn @@ -51,7 +51,6 @@ ohos_shared_library("libhe_vibrator_decoder") { deps = [ "$SUBSYSTEM_DIR/utils/common:libmiscdevice_utils" ] external_deps = [ - "access_token:libaccesstoken_sdk", "cJSON:cjson", "c_utils:utils", "hilog:libhilog", diff --git a/utils/haptic_decoder/he_json/include/he_vibrator_decoder.h b/utils/haptic_decoder/he_json/include/he_vibrator_decoder.h index cffeab1151b9b3049fbe95edfb40a84d044a1928..8b461ca19099b3cfcc523043941adae0c940dccc 100644 --- a/utils/haptic_decoder/he_json/include/he_vibrator_decoder.h +++ b/utils/haptic_decoder/he_json/include/he_vibrator_decoder.h @@ -16,11 +16,7 @@ #ifndef HE_VIBRATOR_DECODER_H #define HE_VIBRATOR_DECODER_H -#include -#include - #include "i_vibrator_decoder.h" -#include "json_parser.h" namespace OHOS { namespace Sensors { diff --git a/utils/haptic_decoder/interface/i_vibrator_decoder.h b/utils/haptic_decoder/interface/i_vibrator_decoder.h index 0bd260b8155892fe38e2e24890d0472a803c4fb7..852b27713e0ce257c7021f9d69de9bc7749272bb 100644 --- a/utils/haptic_decoder/interface/i_vibrator_decoder.h +++ b/utils/haptic_decoder/interface/i_vibrator_decoder.h @@ -17,7 +17,6 @@ #define VIBRATOR_DECODER_H #include "json_parser.h" -#include "raw_file_descriptor.h" #include "vibrator_infos.h" namespace OHOS { diff --git a/utils/haptic_decoder/interface/vibrator_decoder_creator.cpp b/utils/haptic_decoder/interface/vibrator_decoder_creator.cpp index ac9724bf6c6af746bf3952cc5b66d3fef952afb1..b20d143fa44224b47b82baee8384554a46b3af7d 100644 --- a/utils/haptic_decoder/interface/vibrator_decoder_creator.cpp +++ b/utils/haptic_decoder/interface/vibrator_decoder_creator.cpp @@ -14,11 +14,7 @@ */ #include "vibrator_decoder_creator.h" -#include -#include - #include "default_vibrator_decoder_factory.h" -#include "file_utils.h" #include "he_vibrator_decoder_factory.h" #include "sensors_errors.h" diff --git a/utils/haptic_decoder/interface/vibrator_decoder_creator.h b/utils/haptic_decoder/interface/vibrator_decoder_creator.h index c0ca16c0f5105dd5dc77b5110d32c4bd3933d291..a41841a77672365ed099c861a5089f9a2dc27ede 100644 --- a/utils/haptic_decoder/interface/vibrator_decoder_creator.h +++ b/utils/haptic_decoder/interface/vibrator_decoder_creator.h @@ -17,9 +17,6 @@ #define VIBRATOR_DECODER_MANAGER_H #include "i_vibrator_decoder.h" -#include "json_parser.h" -#include "raw_file_descriptor.h" -#include "vibrator_infos.h" namespace OHOS { namespace Sensors { diff --git a/utils/haptic_decoder/oh_json/BUILD.gn b/utils/haptic_decoder/oh_json/BUILD.gn index 0816fb89612e552a2a839d1d2e47aa0dc6eacf7a..71ead49b047c08875f73f21eefa50ca8f3e7c32c 100644 --- a/utils/haptic_decoder/oh_json/BUILD.gn +++ b/utils/haptic_decoder/oh_json/BUILD.gn @@ -56,7 +56,6 @@ ohos_shared_library("libvibrator_decoder") { ] external_deps = [ - "access_token:libaccesstoken_sdk", "cJSON:cjson", "c_utils:utils", "hilog:libhilog", diff --git a/utils/haptic_decoder/oh_json/include/default_vibrator_decoder.h b/utils/haptic_decoder/oh_json/include/default_vibrator_decoder.h index 4d4f314846ded662d9a21256795c28be505f4b7d..f790e69df959abdc695cd55218fabe75ef4b3ed4 100644 --- a/utils/haptic_decoder/oh_json/include/default_vibrator_decoder.h +++ b/utils/haptic_decoder/oh_json/include/default_vibrator_decoder.h @@ -16,11 +16,7 @@ #ifndef DEFAULT_VIBRATOR_DECODER_H #define DEFAULT_VIBRATOR_DECODER_H -#include -#include - #include "i_vibrator_decoder.h" -#include "json_parser.h" namespace OHOS { namespace Sensors { diff --git a/utils/haptic_decoder/oh_json/src/default_vibrator_decoder.cpp b/utils/haptic_decoder/oh_json/src/default_vibrator_decoder.cpp index 066428288aa167553a71b3e2e08a353f38ca06d7..b9f6e7fb25ced78331a22000d36e73f6cc5880f1 100644 --- a/utils/haptic_decoder/oh_json/src/default_vibrator_decoder.cpp +++ b/utils/haptic_decoder/oh_json/src/default_vibrator_decoder.cpp @@ -15,7 +15,6 @@ #include "default_vibrator_decoder.h" -#include #include #include "sensors_errors.h"