From f72dfdc45d278edd29492999b1021689f8c422ef Mon Sep 17 00:00:00 2001 From: meng-xinhai Date: Tue, 11 Mar 2025 09:56:29 +0800 Subject: [PATCH 1/2] Delete motor redundancy code Signed-off-by: meng-xinhai Change-Id: Ia16c0a0abb4c48668284ad4940b216419a5c44a0 --- services/miscdevice_service/BUILD.gn | 20 ------------------- .../include/custom_vibration_matcher.h | 4 ---- .../src/custom_vibration_matcher.cpp | 2 -- .../adapter/include/compatible_connection.h | 1 - .../include/compatible_light_connection.h | 3 --- .../adapter/src/compatible_connection.cpp | 4 ---- .../src/compatible_light_connection.cpp | 4 ---- .../adapter/src/hdi_light_connection.cpp | 7 ------- .../include/i_light_hdi_connection.h | 4 ---- .../include/i_vibrator_hdi_connection.h | 6 ------ .../interface/include/light_hdi_connection.h | 2 -- .../interface/src/light_hdi_connection.cpp | 2 -- .../miscdevice_common_event_subscriber.h | 3 --- .../include/miscdevice_dump.h | 1 - .../include/miscdevice_service.h | 14 ------------- .../include/vibration_priority_manager.h | 8 -------- .../include/vibrator_thread.h | 3 --- .../src/miscdevice_dump.cpp | 3 --- .../src/miscdevice_service.cpp | 8 -------- .../src/vibration_priority_manager.cpp | 2 -- utils/BUILD.gn | 1 - utils/common/BUILD.gn | 1 - utils/common/include/file_utils.h | 4 ---- utils/common/include/json_parser.h | 2 -- utils/common/include/light_info_ipc.h | 2 -- utils/common/include/miscdevice_common.h | 3 --- .../include/miscdevice_delayed_sp_singleton.h | 5 ----- utils/common/include/miscdevice_log.h | 3 --- utils/common/include/permission_util.h | 4 ---- utils/common/include/raw_file_descriptor.h | 2 -- utils/common/include/vibrator_infos.h | 4 ---- utils/common/src/file_utils.cpp | 1 - utils/common/src/json_parser.cpp | 4 ---- utils/common/src/permission_util.cpp | 2 -- utils/common/src/vibrator_infos.cpp | 6 ------ utils/haptic_decoder/he_json/BUILD.gn | 1 - .../he_json/include/he_vibrator_decoder.h | 4 ---- .../interface/i_vibrator_decoder.h | 1 - .../interface/vibrator_decoder_creator.cpp | 4 ---- .../interface/vibrator_decoder_creator.h | 3 --- utils/haptic_decoder/oh_json/BUILD.gn | 1 - .../include/default_vibrator_decoder.h | 4 ---- .../oh_json/src/default_vibrator_decoder.cpp | 1 - 43 files changed, 164 deletions(-) diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 85905a2..dddfb51 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -71,22 +71,12 @@ 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 +184,12 @@ 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 15c2367..1df08ed 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 06a38e8..27967db 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 369f3c1..954c274 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 9f0839a..012c711 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 eb4d1ef..ebecb24 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 8c56d38..52ce7ff 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 f5c9153..12ba4b7 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 d0e7bc8..728f96a 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 d47587f..008b3db 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 e8a57b2..95e6a5f 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 2c4abfc..df79cf3 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 9f5defa..6297c2a 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 741eb74..9b2ebe0 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 403cb21..0a4b531 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 de5819d..8b477ac 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 404bb94..14d5c02 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 dd64617..37522c9 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 f66028d..eb5b44d 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 4625e42..7ad56f9 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 4501b3c..7122680 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 88a3981..2f2b626 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 274a34b..80c2b2d 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 093e559..875b80e 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 100e191..9bf0ecf 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 4a71ec5..9f69777 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 49fa02c..b6b4b97 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 e194505..c30cd61 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 7466828..234d475 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 54a84bd..50df291 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 6302516..140d3c2 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 c580128..26400bf 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 c6acb2f..ba5ce27 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 2fdbd52..d5f49d4 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 4b3eaee..e373e0a 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 83df7f5..cbf086a 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 cffeab1..8b461ca 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 0bd260b..852b277 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 ac9724b..b20d143 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 c0ca16c..a41841a 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 0816fb8..71ead49 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 4d4f314..f790e69 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 0664282..b9f6e7f 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" -- Gitee From 03a72e8523cfaa6438c57baff530fcdc9db87ff1 Mon Sep 17 00:00:00 2001 From: meng-xinhai Date: Wed, 12 Mar 2025 09:05:59 +0800 Subject: [PATCH 2/2] Delete motor redundancy code Signed-off-by: meng-xinhai Change-Id: I7e185a144501a99a523da007feefefe1313ab836 --- services/miscdevice_service/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index dddfb51..418469d 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -76,6 +76,7 @@ ohos_shared_library("libmiscdevice_service") { "access_token:libtokenid_sdk", "cJSON:cjson", "data_share:datashare_consumer", + "hilog:libhilog", "safwk:system_ability_fwk", ] @@ -189,6 +190,7 @@ ohos_static_library("libmiscdevice_service_static") { "access_token:libtokenid_sdk", "cJSON:cjson", "data_share:datashare_consumer", + "hilog:libhilog", "safwk:system_ability_fwk", ] -- Gitee