From a65f84d1e8fe81dc09cc8fd8de6cbbc705d85605 Mon Sep 17 00:00:00 2001 From: tu-xinxin Date: Tue, 3 Sep 2024 15:13:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?miscdevice=E8=A7=A3=E8=80=A6vibrator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tu-xinxin --- miscdevice.gni | 13 ++++++ .../adapter/include/compatible_connection.h | 4 ++ .../adapter/include/hdi_connection.h | 4 ++ .../adapter/src/compatible_connection.cpp | 4 ++ .../adapter/src/hdi_connection.cpp | 18 ++++++++ .../include/i_vibrator_hdi_connection.h | 8 ++++ .../include/miscdevice_service.h | 20 +++++++++ .../src/miscdevice_service.cpp | 42 +++++++++++++++++++ .../service/getdelaytimestub_fuzzer/BUILD.gn | 5 ++- .../service/getlightliststub_fuzzer/BUILD.gn | 5 ++- .../getvibratorcapacitystub_fuzzer/BUILD.gn | 5 ++- .../issupporteffectstub_fuzzer/BUILD.gn | 5 ++- .../service/playpatternstub_fuzzer/BUILD.gn | 5 ++- .../playprimitiveeffectstub_fuzzer/BUILD.gn | 5 ++- .../playvibratorcustomstub_fuzzer/BUILD.gn | 5 ++- .../playvibratoreffectstub_fuzzer/BUILD.gn | 5 ++- .../stopvibratorallstub_fuzzer/BUILD.gn | 5 ++- .../stopvibratorbymodestub_fuzzer/BUILD.gn | 5 ++- .../BUILD.gn | 5 ++- .../service/turnoffstub_fuzzer/BUILD.gn | 5 ++- .../service/turnonstub_fuzzer/BUILD.gn | 5 ++- .../service/vibratestub_fuzzer/BUILD.gn | 5 ++- .../vibratoronremoterequest_fuzzer/BUILD.gn | 5 ++- 23 files changed, 173 insertions(+), 15 deletions(-) diff --git a/miscdevice.gni b/miscdevice.gni index 7db0b94..f65c58e 100644 --- a/miscdevice.gni +++ b/miscdevice.gni @@ -16,6 +16,7 @@ import("//build/ohos.gni") declare_args() { miscdevice_feature_vibrator_custom = true miscdevice_feature_hiviewdfx_hisysevent = true + miscdevice_feature_hdf_drivers_interface_vibrator = true } print( @@ -27,6 +28,18 @@ FUZZ_MODULE_OUT_PATH = "miscdevice/miscdevice" miscdevice_default_defines = [] +if (!defined(global_parts_info) || + defined(global_parts_info.hdf_drivers_interface_vibrator)) { + miscdevice_feature_hdf_drivers_interface_vibrator = true + miscdevice_default_defines += [ "HDF_DRIVERS_INTERFACE_VIBRATOR" ] +} else { + miscdevice_feature_hdf_drivers_interface_vibrator = false +} + +if (!miscdevice_feature_hdf_drivers_interface_vibrator) { + miscdevice_feature_vibrator_custom = false +} + if (miscdevice_feature_vibrator_custom) { miscdevice_default_defines += [ "OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM" ] } 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 ad11c9f..d1aeb87 100644 --- a/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h +++ b/services/miscdevice_service/hdi_connection/adapter/include/compatible_connection.h @@ -34,11 +34,15 @@ public: int32_t EnableCompositeEffect(const HdfCompositeEffect &hdfCompositeEffect) override; bool IsVibratorRunning() override; #endif // OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR std::optional GetEffectInfo(const std::string &effect) override; int32_t Stop(HdfVibratorModeV1_2 mode) override; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR int32_t GetDelayTime(int32_t mode, int32_t &delayTime) override; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR int32_t GetVibratorCapacity(VibratorCapacity &capacity) override; int32_t PlayPattern(const VibratePattern &pattern) override; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR int32_t DestroyHdiConnection() override; int32_t StartByIntensity(const std::string &effect, int32_t intensity) override; int32_t GetAllWaveInfo(std::vector &waveInfos) override; diff --git a/services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h b/services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h index 196488c..885f8d7 100644 --- a/services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h +++ b/services/miscdevice_service/hdi_connection/adapter/include/hdi_connection.h @@ -16,7 +16,9 @@ #ifndef HDI_CONNECTION_H #define HDI_CONNECTION_H +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR #include "v1_3/vibrator_interface_proxy.h" +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR #include "death_recipient_template.h" #include "i_vibrator_hdi_connection.h" @@ -47,7 +49,9 @@ public: private: DISALLOW_COPY_AND_MOVE(HdiConnection); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR sptr vibratorInterface_ = nullptr; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR sptr hdiDeathObserver_ = nullptr; void RegisterHdiDeathRecipient(); void UnregisterHdiDeathRecipient(); 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 8a09d86..88b0b5c 100644 --- a/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adapter/src/compatible_connection.cpp @@ -43,9 +43,12 @@ std::unordered_map g_vibratorEffect = { {"haptic.effect.soft", 30}, {"haptic.effect.sharp", 20} }; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR HdfVibratorModeV1_2 g_vibrateMode; constexpr int32_t VIBRATE_DELAY_TIME = 10; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR } // namespace +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR int32_t CompatibleConnection::duration_ = 0; std::atomic_bool CompatibleConnection::isStop_ = true; @@ -211,6 +214,7 @@ int32_t CompatibleConnection::GetAllWaveInfo(std::vector &wa { return ERR_OK; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR } // namespace Sensors } // namespace OHOS diff --git a/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp b/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp index 6d22d80..e55c644 100644 --- a/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp +++ b/services/miscdevice_service/hdi_connection/adapter/src/hdi_connection.cpp @@ -38,11 +38,13 @@ int32_t HdiConnection::ConnectHdi() CALL_LOG_ENTER; int32_t retry = 0; while (retry < GET_HDI_SERVICE_COUNT) { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR vibratorInterface_ = IVibratorInterface::Get(); if (vibratorInterface_ != nullptr) { RegisterHdiDeathRecipient(); return ERR_OK; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR retry++; MISC_HILOGW("Connect hdi service failed, retry:%{public}d", retry); std::this_thread::sleep_for(std::chrono::milliseconds(WAIT_MS)); @@ -57,6 +59,7 @@ int32_t HdiConnection::ConnectHdi() int32_t HdiConnection::StartOnce(uint32_t duration) { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR CHKPR(vibratorInterface_, ERR_INVALID_VALUE); int32_t ret = vibratorInterface_->StartOnce(duration); if (ret < 0) { @@ -67,6 +70,7 @@ int32_t HdiConnection::StartOnce(uint32_t duration) MISC_HILOGE("StartOnce failed"); return ret; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR return ERR_OK; } @@ -77,6 +81,7 @@ int32_t HdiConnection::Start(const std::string &effectType) MISC_HILOGE("effectType is null"); return VIBRATOR_ON_ERR; } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR CHKPR(vibratorInterface_, ERR_INVALID_VALUE); int32_t ret = vibratorInterface_->Start(effectType); if (ret < 0) { @@ -87,6 +92,7 @@ int32_t HdiConnection::Start(const std::string &effectType) MISC_HILOGE("Start failed"); return ret; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR return ERR_OK; } @@ -120,6 +126,7 @@ bool HdiConnection::IsVibratorRunning() } #endif // OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR std::optional HdiConnection::GetEffectInfo(const std::string &effect) { if (vibratorInterface_ == nullptr) { @@ -153,9 +160,11 @@ int32_t HdiConnection::Stop(HdfVibratorModeV1_2 mode) } return ERR_OK; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR int32_t HdiConnection::GetDelayTime(int32_t mode, int32_t &delayTime) { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR CHKPR(vibratorInterface_, ERR_INVALID_VALUE); int32_t ret = vibratorInterface_->GetHapticStartUpTime(mode, delayTime); if (ret < 0) { @@ -166,11 +175,13 @@ int32_t HdiConnection::GetDelayTime(int32_t mode, int32_t &delayTime) MISC_HILOGE("GetDelayTime failed"); return ret; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR return ERR_OK; } int32_t HdiConnection::GetVibratorCapacity(VibratorCapacity &capacity) { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR CHKPR(vibratorInterface_, ERR_INVALID_VALUE); HapticCapacity hapticCapacity; int32_t ret = vibratorInterface_->GetHapticCapacity(hapticCapacity); @@ -186,11 +197,13 @@ int32_t HdiConnection::GetVibratorCapacity(VibratorCapacity &capacity) capacity.isSupportPresetMapping = hapticCapacity.isSupportPresetMapping; capacity.isSupportTimeDelay = hapticCapacity.isSupportTimeDelay; capacity.Dump(); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR return ERR_OK; } int32_t HdiConnection::PlayPattern(const VibratePattern &pattern) { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR CHKPR(vibratorInterface_, ERR_INVALID_VALUE); HapticPaket packet = {}; packet.time = pattern.startTime; @@ -224,6 +237,7 @@ int32_t HdiConnection::PlayPattern(const VibratePattern &pattern) MISC_HILOGE("PlayHapticPattern failed"); return ret; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR return ERR_OK; } @@ -236,6 +250,7 @@ int32_t HdiConnection::DestroyHdiConnection() void HdiConnection::RegisterHdiDeathRecipient() { CALL_LOG_ENTER; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR if (vibratorInterface_ == nullptr) { MISC_HILOGE("Connect v1_1 hdi failed"); return; @@ -245,16 +260,19 @@ void HdiConnection::RegisterHdiDeathRecipient() CHKPV(hdiDeathObserver_); } OHOS::HDI::hdi_objcast(vibratorInterface_)->AddDeathRecipient(hdiDeathObserver_); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR } void HdiConnection::UnregisterHdiDeathRecipient() { CALL_LOG_ENTER; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR if (vibratorInterface_ == nullptr || hdiDeathObserver_ == nullptr) { MISC_HILOGE("vibratorInterface_ or hdiDeathObserver_ is null"); return; } OHOS::HDI::hdi_objcast(vibratorInterface_)->RemoveDeathRecipient(hdiDeathObserver_); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR } void HdiConnection::ProcessDeathObserver(const wptr &object) 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 340826d..9fe9737 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 @@ -21,12 +21,15 @@ #include #include +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR #include "v1_2/vibrator_types.h" #include "v1_3/ivibrator_interface.h" #include "vibrator_infos.h" +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR namespace OHOS { namespace Sensors { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR using OHOS::HDI::Vibrator::V1_2::HdfVibratorModeV1_2; using OHOS::HDI::Vibrator::V1_2::HDF_VIBRATOR_MODE_ONCE; using OHOS::HDI::Vibrator::V1_2::HDF_VIBRATOR_MODE_PRESET; @@ -49,6 +52,7 @@ using OHOS::HDI::Vibrator::V1_1::PrimitiveEffect; using OHOS::HDI::Vibrator::V1_1::CompositeEffect; using OHOS::HDI::Vibrator::V1_1::HdfCompositeEffect; #endif // OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR class IVibratorHdiConnection { public: IVibratorHdiConnection() = default; @@ -60,12 +64,16 @@ public: virtual int32_t EnableCompositeEffect(const HdfCompositeEffect &hdfCompositeEffect) = 0; virtual bool IsVibratorRunning() = 0; #endif // OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR virtual std::optional GetEffectInfo(const std::string &effect) = 0; virtual int32_t Stop(HdfVibratorModeV1_2 mode) = 0; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR virtual int32_t DestroyHdiConnection() = 0; virtual int32_t GetDelayTime(int32_t mode, int32_t &delayTime) = 0; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR virtual int32_t GetVibratorCapacity(VibratorCapacity &capacity) = 0; virtual int32_t PlayPattern(const VibratePattern &pattern) = 0; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR virtual int32_t StartByIntensity(const std::string &effect, int32_t intensity) = 0; virtual int32_t GetAllWaveInfo(std::vector &waveInfos) = 0; diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index 07b0b54..fd28b29 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -38,9 +38,11 @@ #include "miscdevice_delayed_sp_singleton.h" #include "miscdevice_dump.h" #include "miscdevice_service_stub.h" +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR #include "vibrator_hdi_connection.h" #include "vibrator_infos.h" #include "vibrator_thread.h" +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR namespace OHOS { namespace Sensors { @@ -63,6 +65,7 @@ public: bool IsLightAnimationValid(const LightAnimationIPC &animation); int32_t Dump(int32_t fd, const std::vector &args) override; void ProcessDeathObserver(const wptr &object); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR virtual int32_t Vibrate(int32_t vibratorId, int32_t timeOut, int32_t usage, bool systemUsage) override; virtual int32_t PlayVibratorEffect(int32_t vibratorId, const std::string &effect, int32_t loopCount, int32_t usage, bool systemUsage) override; @@ -73,28 +76,39 @@ public: virtual int32_t StopVibrator(int32_t vibratorId) override; virtual int32_t StopVibrator(int32_t vibratorId, const std::string &mode) override; virtual int32_t IsSupportEffect(const std::string &effect, bool &state) override; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR virtual std::vector GetLightList() override; virtual int32_t TurnOn(int32_t lightId, const LightColor &color, const LightAnimationIPC &animation) override; virtual int32_t TurnOff(int32_t lightId) override; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR virtual int32_t PlayPattern(const VibratePattern &pattern, int32_t usage, bool systemUsage, const VibrateParameter ¶meter) override; virtual int32_t GetDelayTime(int32_t &delayTime) override; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR virtual int32_t TransferClientRemoteObject(const sptr &vibratorServiceClient) override; virtual int32_t PlayPrimitiveEffect(int32_t vibratorId, const std::string &effect, int32_t intensity, int32_t usage, bool systemUsage, int32_t count) override; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR virtual int32_t GetVibratorCapacity(VibratorCapacity &capacity) override; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR private: DISALLOW_COPY_AND_MOVE(MiscdeviceService); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR bool InitInterface(); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR bool InitLightInterface(); std::string GetPackageName(AccessTokenID tokenId); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR void StartVibrateThread(VibrateInfo info); void StopVibrateThread(); bool ShouldIgnoreVibrate(const VibrateInfo &info); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR std::string GetCurrentTime(); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR void MergeVibratorParmeters(const VibrateParameter ¶meter, VibratePackage &package); bool CheckVibratorParmeters(const VibrateParameter ¶meter); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR bool InitLightList(); void RegisterClientDeathRecipient(sptr vibratorServiceClient, int32_t pid); void UnregisterClientDeathRecipient(sptr vibratorServiceClient); @@ -104,17 +118,23 @@ private: void OnAddSystemAbility(int32_t systemAbilityId, const std::string &deviceId) override; int32_t SubscribeCommonEvent(const std::string &eventName, EventReceiver receiver); void OnReceiveEvent(const EventFwk::CommonEventData &data); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR std::mutex isVibrationPriorityReadyMutex_; static bool isVibrationPriorityReady_; VibratorHdiConnection &vibratorHdiConnection_ = VibratorHdiConnection::GetInstance(); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR LightHdiConnection &lightHdiConnection_ = LightHdiConnection::GetInstance(); bool lightExist_; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR bool vibratorExist_; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR std::vector lightInfos_; std::map miscDeviceIdMap_; MiscdeviceServiceState state_; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR std::shared_ptr vibratorThread_ = nullptr; std::mutex vibratorThreadMutex_; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR sptr clientDeathObserver_ = nullptr; std::mutex clientDeathObserverMutex_; std::map, int32_t> clientPidMap_; diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 9a5510f..652e321 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -27,7 +27,9 @@ #include "system_ability_definition.h" #include "sensors_errors.h" +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR #include "vibration_priority_manager.h" +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR #ifdef HDF_DRIVERS_INTERFACE_LIGHT #include "v1_0/light_interface_proxy.h" @@ -46,6 +48,7 @@ namespace OHOS { namespace Sensors { namespace { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR auto g_miscdeviceService = MiscdeviceDelayedSpSingleton::GetInstance(); const bool G_REGISTER_RESULT = SystemAbility::MakeAndRegisterAbility(g_miscdeviceService.GetRefPtr()); constexpr int32_t MIN_VIBRATOR_TIME = 0; @@ -62,17 +65,23 @@ constexpr int32_t FREQUENCY_ADJUST_MIN = -100; constexpr int32_t FREQUENCY_ADJUST_MAX = 100; constexpr int32_t INVALID_PID = -1; constexpr int32_t VIBRATOR_ID = 0; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR constexpr int32_t BASE_YEAR = 1900; constexpr int32_t BASE_MON = 1; constexpr int32_t CONVERSION_RATE = 1000; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR VibratorCapacity g_capacity; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR #ifdef OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM const std::string PHONE_TYPE = "phone"; #endif // OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM } // namespace +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR bool MiscdeviceService::isVibrationPriorityReady_ = false; +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR MiscdeviceService::MiscdeviceService() : SystemAbility(MISCDEVICE_SERVICE_ABILITY_ID, true), lightExist_(false), @@ -82,10 +91,21 @@ MiscdeviceService::MiscdeviceService() { MISC_HILOGD("Add SystemAbility"); } +#else +MiscdeviceService::MiscdeviceService() + : SystemAbility(MISCDEVICE_SERVICE_ABILITY_ID, true), + lightExist_(false), + state_(MiscdeviceServiceState::STATE_STOPPED) +{ + MISC_HILOGD("Add SystemAbility"); +} +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR MiscdeviceService::~MiscdeviceService() { +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR StopVibrateThread(); +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR } void MiscdeviceService::OnDump() @@ -135,6 +155,7 @@ void MiscdeviceService::OnAddSystemAbility(int32_t systemAbilityId, const std::s } case DISTRIBUTED_KV_DATA_SERVICE_ABILITY_ID: { MISC_HILOGI("Distributed kv data service start"); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR std::lock_guard lock(isVibrationPriorityReadyMutex_); if (PriorityManager->Init()) { MISC_HILOGI("PriorityManager init"); @@ -142,6 +163,7 @@ void MiscdeviceService::OnAddSystemAbility(int32_t systemAbilityId, const std::s } else { MISC_HILOGE("PriorityManager init fail"); } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR break; } default: { @@ -157,6 +179,7 @@ void MiscdeviceService::OnReceiveEvent(const EventFwk::CommonEventData &data) std::string action = want.GetAction(); if (action == "usual.event.DATA_SHARE_READY") { MISC_HILOGI("On receive usual.event.DATA_SHARE_READY"); +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR std::lock_guard lock(isVibrationPriorityReadyMutex_); if (isVibrationPriorityReady_) { MISC_HILOGI("PriorityManager already init"); @@ -168,6 +191,7 @@ void MiscdeviceService::OnReceiveEvent(const EventFwk::CommonEventData &data) } else { MISC_HILOGE("PriorityManager init fail"); } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR } } @@ -178,27 +202,33 @@ void MiscdeviceService::OnStart() MISC_HILOGW("state_ already started"); return; } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR if (!InitInterface()) { MISC_HILOGE("Init interface error"); } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR if (!InitLightInterface()) { MISC_HILOGE("InitLightInterface failed"); } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR if (!SystemAbility::Publish(MiscdeviceDelayedSpSingleton::GetInstance())) { MISC_HILOGE("Publish MiscdeviceService failed"); return; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR std::lock_guard lock(miscDeviceIdMapMutex_); auto ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::LED, lightExist_)); if (!ret.second) { MISC_HILOGI("Light exist in miscDeviceIdMap_"); ret.first->second = lightExist_; } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::VIBRATOR, vibratorExist_)); if (!ret.second) { MISC_HILOGI("Vibrator exist in miscDeviceIdMap_"); ret.first->second = vibratorExist_; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR state_ = MiscdeviceServiceState::STATE_RUNNING; #ifdef MEMMGR_ENABLE AddSystemAbilityListener(MEMORY_MANAGER_SA_ID); @@ -213,9 +243,11 @@ void MiscdeviceService::OnStartFuzz() MISC_HILOGW("state_ already started"); return; } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR if (!InitInterface()) { MISC_HILOGE("Init interface error"); } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR if (!InitLightInterface()) { MISC_HILOGE("InitLightInterface failed"); } @@ -225,14 +257,17 @@ void MiscdeviceService::OnStartFuzz() MISC_HILOGI("Light exist in miscDeviceIdMap_"); ret.first->second = lightExist_; } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR ret = miscDeviceIdMap_.insert(std::make_pair(MiscdeviceDeviceId::VIBRATOR, vibratorExist_)); if (!ret.second) { MISC_HILOGI("Vibrator exist in miscDeviceIdMap_"); ret.first->second = vibratorExist_; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR state_ = MiscdeviceServiceState::STATE_RUNNING; } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR bool MiscdeviceService::InitInterface() { auto ret = vibratorHdiConnection_.ConnectHdi(); @@ -245,6 +280,7 @@ bool MiscdeviceService::InitInterface() } return true; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR bool MiscdeviceService::InitLightInterface() { @@ -293,16 +329,19 @@ void MiscdeviceService::OnStop() return; } state_ = MiscdeviceServiceState::STATE_STOPPED; +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR int32_t ret = vibratorHdiConnection_.DestroyHdiConnection(); if (ret != ERR_OK) { MISC_HILOGE("Destroy hdi connection fail"); } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR #ifdef MEMMGR_ENABLE Memory::MemMgrClient::GetInstance().NotifyProcessStatus(getpid(), PROCESS_TYPE_SA, PROCESS_STATUS_DIED, MISCDEVICE_SERVICE_ABILITY_ID); #endif // MEMMGR_ENABLE } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR bool MiscdeviceService::ShouldIgnoreVibrate(const VibrateInfo &info) { std::lock_guard lock(isVibrationPriorityReadyMutex_); @@ -467,6 +506,7 @@ int32_t MiscdeviceService::IsSupportEffect(const std::string &effect, bool &stat state = effectInfo->isSupportEffect; return NO_ERROR; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR std::string MiscdeviceService::GetCurrentTime() { @@ -650,6 +690,7 @@ int32_t MiscdeviceService::Dump(int32_t fd, const std::vector &a return ERR_OK; } +#ifdef HDF_DRIVERS_INTERFACE_VIBRATOR int32_t MiscdeviceService::PlayPattern(const VibratePattern &pattern, int32_t usage, bool systemUsage, const VibrateParameter ¶meter) { @@ -900,5 +941,6 @@ int32_t MiscdeviceService::GetVibratorCapacity(VibratorCapacity &capacity) capacity = g_capacity; return ERR_OK; } +#endif // HDF_DRIVERS_INTERFACE_VIBRATOR } // namespace Sensors } // namespace OHOS diff --git a/test/fuzztest/service/getdelaytimestub_fuzzer/BUILD.gn b/test/fuzztest/service/getdelaytimestub_fuzzer/BUILD.gn index 21a97f3..a54759c 100644 --- a/test/fuzztest/service/getdelaytimestub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/getdelaytimestub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("GetDelayTimeStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("GetDelayTimeStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/getlightliststub_fuzzer/BUILD.gn b/test/fuzztest/service/getlightliststub_fuzzer/BUILD.gn index 98fc715..61a0903 100644 --- a/test/fuzztest/service/getlightliststub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/getlightliststub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("GetLightListStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("GetLightListStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/getvibratorcapacitystub_fuzzer/BUILD.gn b/test/fuzztest/service/getvibratorcapacitystub_fuzzer/BUILD.gn index 8718908..8adaa03 100644 --- a/test/fuzztest/service/getvibratorcapacitystub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/getvibratorcapacitystub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("GetVibratorCapacityStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("GetVibratorCapacityStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/issupporteffectstub_fuzzer/BUILD.gn b/test/fuzztest/service/issupporteffectstub_fuzzer/BUILD.gn index f9d151d..ca6be27 100644 --- a/test/fuzztest/service/issupporteffectstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/issupporteffectstub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("IsSupportEffectStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("IsSupportEffectStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/playpatternstub_fuzzer/BUILD.gn b/test/fuzztest/service/playpatternstub_fuzzer/BUILD.gn index 2a584d1..01b6fc9 100644 --- a/test/fuzztest/service/playpatternstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/playpatternstub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("PlayPatternStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("PlayPatternStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/playprimitiveeffectstub_fuzzer/BUILD.gn b/test/fuzztest/service/playprimitiveeffectstub_fuzzer/BUILD.gn index 69ec08c..dc89839 100644 --- a/test/fuzztest/service/playprimitiveeffectstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/playprimitiveeffectstub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("PlayPrimitiveEffectStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("PlayPrimitiveEffectStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/playvibratorcustomstub_fuzzer/BUILD.gn b/test/fuzztest/service/playvibratorcustomstub_fuzzer/BUILD.gn index 8a039bf..db56585 100644 --- a/test/fuzztest/service/playvibratorcustomstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/playvibratorcustomstub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("PlayVibratorCustomStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("PlayVibratorCustomStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/playvibratoreffectstub_fuzzer/BUILD.gn b/test/fuzztest/service/playvibratoreffectstub_fuzzer/BUILD.gn index f9260c1..2709e04 100644 --- a/test/fuzztest/service/playvibratoreffectstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/playvibratoreffectstub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("PlayVibratorEffectStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("PlayVibratorEffectStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/stopvibratorallstub_fuzzer/BUILD.gn b/test/fuzztest/service/stopvibratorallstub_fuzzer/BUILD.gn index c9c9ebf..644f3a0 100644 --- a/test/fuzztest/service/stopvibratorallstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/stopvibratorallstub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("StopVibratorAllStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("StopVibratorAllStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/stopvibratorbymodestub_fuzzer/BUILD.gn b/test/fuzztest/service/stopvibratorbymodestub_fuzzer/BUILD.gn index 0a3abf1..06a772f 100644 --- a/test/fuzztest/service/stopvibratorbymodestub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/stopvibratorbymodestub_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("StopVibratorByModeStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("StopVibratorByModeStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/transferclientremoteobjectstub_fuzzer/BUILD.gn b/test/fuzztest/service/transferclientremoteobjectstub_fuzzer/BUILD.gn index 9afa0bd..863971a 100644 --- a/test/fuzztest/service/transferclientremoteobjectstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/transferclientremoteobjectstub_fuzzer/BUILD.gn @@ -54,7 +54,6 @@ ohos_fuzztest("TransferClientRemoteObjectStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -65,6 +64,10 @@ ohos_fuzztest("TransferClientRemoteObjectStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn b/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn index 326a39d..21bc612 100644 --- a/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn @@ -54,7 +54,6 @@ ohos_fuzztest("TurnOffStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -65,6 +64,10 @@ ohos_fuzztest("TurnOffStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/turnonstub_fuzzer/BUILD.gn b/test/fuzztest/service/turnonstub_fuzzer/BUILD.gn index 99ee4b7..d8e515b 100644 --- a/test/fuzztest/service/turnonstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/turnonstub_fuzzer/BUILD.gn @@ -54,7 +54,6 @@ ohos_fuzztest("TurnOnStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -65,6 +64,10 @@ ohos_fuzztest("TurnOnStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/vibratestub_fuzzer/BUILD.gn b/test/fuzztest/service/vibratestub_fuzzer/BUILD.gn index 698efb1..d7c3383 100644 --- a/test/fuzztest/service/vibratestub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/vibratestub_fuzzer/BUILD.gn @@ -54,7 +54,6 @@ ohos_fuzztest("VibrateStubFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -65,6 +64,10 @@ ohos_fuzztest("VibrateStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { diff --git a/test/fuzztest/service/vibratoronremoterequest_fuzzer/BUILD.gn b/test/fuzztest/service/vibratoronremoterequest_fuzzer/BUILD.gn index 55ec05f..6f573f0 100644 --- a/test/fuzztest/service/vibratoronremoterequest_fuzzer/BUILD.gn +++ b/test/fuzztest/service/vibratoronremoterequest_fuzzer/BUILD.gn @@ -55,7 +55,6 @@ ohos_fuzztest("VibratorOnRemoteRequestFuzzTest") { "access_token:libtokensetproc_shared", "cJSON:cjson", "c_utils:utils", - "drivers_interface_vibrator:libvibrator_proxy_1.1", "hilog:libhilog", "ipc:ipc_single", "samgr:samgr_proxy", @@ -66,6 +65,10 @@ ohos_fuzztest("VibratorOnRemoteRequestFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] + } } group("fuzztest") { -- Gitee From bc4718e6a4521f32285a2f1be070d8d6f609dbd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=82xx?= Date: Tue, 3 Sep 2024 07:24:14 +0000 Subject: [PATCH 2/4] update test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 涂xx --- test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn b/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn index 21bc612..f808c83 100644 --- a/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn +++ b/test/fuzztest/service/turnoffstub_fuzzer/BUILD.gn @@ -64,7 +64,7 @@ ohos_fuzztest("TurnOffStubFuzzTest") { if (hdf_drivers_interface_light) { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } - + if (miscdevice_feature_hdf_drivers_interface_vibrator) { external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1" ] } -- Gitee From dedc19693afcbca7f62aa30ebbb8b22bbca1d095 Mon Sep 17 00:00:00 2001 From: tu-xinxin Date: Wed, 4 Sep 2024 17:16:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?miscdevice=E8=A7=A3=E8=80=A6vibrator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tu-xinxin --- services/miscdevice_service/BUILD.gn | 49 +++++++++++++++++++--------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index 0ffbfaf..beb104e 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -16,18 +16,13 @@ import("./../../miscdevice.gni") ohos_shared_library("libmiscdevice_service") { sources = [ - "haptic_matcher/src/custom_vibration_matcher.cpp", "hdi_connection/adapter/src/compatible_light_connection.cpp", - "hdi_connection/adapter/src/hdi_connection.cpp", "hdi_connection/interface/src/light_hdi_connection.cpp", - "hdi_connection/interface/src/vibrator_hdi_connection.cpp", "src/miscdevice_common_event_subscriber.cpp", "src/miscdevice_dump.cpp", "src/miscdevice_observer.cpp", "src/miscdevice_service.cpp", "src/miscdevice_service_stub.cpp", - "src/vibration_priority_manager.cpp", - "src/vibrator_thread.cpp", ] include_dirs = [ @@ -69,9 +64,6 @@ ohos_shared_library("libmiscdevice_service") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "data_share:datashare_consumer", - "drivers_interface_vibrator:libvibrator_proxy_1.1", - "drivers_interface_vibrator:libvibrator_proxy_1.2", - "drivers_interface_vibrator:libvibrator_proxy_1.3", "hilog:libhilog", "ipc:ipc_single", "json:nlohmann_json_static", @@ -96,6 +88,22 @@ ohos_shared_library("libmiscdevice_service") { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + sources += [ + "hdi_connection/interface/src/vibrator_hdi_connection.cpp", + "hdi_connection/adapter/src/hdi_connection.cpp", + "src/vibration_priority_manager.cpp", + "src/vibrator_thread.cpp", + "haptic_matcher/src/custom_vibration_matcher.cpp" + ] + + external_deps += [ + "drivers_interface_vibrator:libvibrator_proxy_1.1", + "drivers_interface_vibrator:libvibrator_proxy_1.2", + "drivers_interface_vibrator:libvibrator_proxy_1.3" + ] + } if (miscdevice_feature_hiviewdfx_hisysevent) { external_deps += [ "hisysevent:libhisysevent" ] @@ -113,18 +121,13 @@ ohos_shared_library("libmiscdevice_service") { ############################################################################# ohos_static_library("libmiscdevice_service_static") { sources = [ - "haptic_matcher/src/custom_vibration_matcher.cpp", "hdi_connection/adapter/src/compatible_light_connection.cpp", - "hdi_connection/adapter/src/hdi_connection.cpp", "hdi_connection/interface/src/light_hdi_connection.cpp", - "hdi_connection/interface/src/vibrator_hdi_connection.cpp", "src/miscdevice_common_event_subscriber.cpp", "src/miscdevice_dump.cpp", "src/miscdevice_observer.cpp", "src/miscdevice_service.cpp", "src/miscdevice_service_stub.cpp", - "src/vibration_priority_manager.cpp", - "src/vibrator_thread.cpp", ] include_dirs = [ @@ -166,9 +169,6 @@ ohos_static_library("libmiscdevice_service_static") { "c_utils:utils", "common_event_service:cesfwk_innerkits", "data_share:datashare_consumer", - "drivers_interface_vibrator:libvibrator_proxy_1.1", - "drivers_interface_vibrator:libvibrator_proxy_1.2", - "drivers_interface_vibrator:libvibrator_proxy_1.3", "hilog:libhilog", "ipc:ipc_single", "json:nlohmann_json_static", @@ -193,6 +193,23 @@ ohos_static_library("libmiscdevice_service_static") { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } + + if (miscdevice_feature_hdf_drivers_interface_vibrator) { + sources += [ + "hdi_connection/interface/src/vibrator_hdi_connection.cpp", + "hdi_connection/adapter/src/hdi_connection.cpp", + "src/vibration_priority_manager.cpp", + "src/vibrator_thread.cpp", + "haptic_matcher/src/custom_vibration_matcher.cpp" + ] + + external_deps += [ + "drivers_interface_vibrator:libvibrator_proxy_1.1", + "drivers_interface_vibrator:libvibrator_proxy_1.2", + "drivers_interface_vibrator:libvibrator_proxy_1.3" + ] + } + if (miscdevice_feature_hiviewdfx_hisysevent) { external_deps += [ "hisysevent:libhisysevent" ] -- Gitee From bda8ea0d61ce21b053f5316a869258b7e20d8265 Mon Sep 17 00:00:00 2001 From: tu-xinxin Date: Wed, 4 Sep 2024 17:51:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?miscdevice=E8=A7=A3=E8=80=A6vibrator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tu-xinxin --- services/miscdevice_service/BUILD.gn | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/services/miscdevice_service/BUILD.gn b/services/miscdevice_service/BUILD.gn index beb104e..18187db 100644 --- a/services/miscdevice_service/BUILD.gn +++ b/services/miscdevice_service/BUILD.gn @@ -88,20 +88,20 @@ ohos_shared_library("libmiscdevice_service") { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } - + if (miscdevice_feature_hdf_drivers_interface_vibrator) { - sources += [ - "hdi_connection/interface/src/vibrator_hdi_connection.cpp", + sources += [ + "haptic_matcher/src/custom_vibration_matcher.cpp", "hdi_connection/adapter/src/hdi_connection.cpp", + "hdi_connection/interface/src/vibrator_hdi_connection.cpp", "src/vibration_priority_manager.cpp", "src/vibrator_thread.cpp", - "haptic_matcher/src/custom_vibration_matcher.cpp" ] - external_deps += [ + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1", "drivers_interface_vibrator:libvibrator_proxy_1.2", - "drivers_interface_vibrator:libvibrator_proxy_1.3" + "drivers_interface_vibrator:libvibrator_proxy_1.3", ] } @@ -193,24 +193,23 @@ ohos_static_library("libmiscdevice_service_static") { external_deps += [ "drivers_interface_light:liblight_proxy_1.0" ] } - + if (miscdevice_feature_hdf_drivers_interface_vibrator) { - sources += [ - "hdi_connection/interface/src/vibrator_hdi_connection.cpp", + sources += [ + "haptic_matcher/src/custom_vibration_matcher.cpp", "hdi_connection/adapter/src/hdi_connection.cpp", + "hdi_connection/interface/src/vibrator_hdi_connection.cpp", "src/vibration_priority_manager.cpp", "src/vibrator_thread.cpp", - "haptic_matcher/src/custom_vibration_matcher.cpp" ] - external_deps += [ + external_deps += [ "drivers_interface_vibrator:libvibrator_proxy_1.1", "drivers_interface_vibrator:libvibrator_proxy_1.2", - "drivers_interface_vibrator:libvibrator_proxy_1.3" + "drivers_interface_vibrator:libvibrator_proxy_1.3", ] } - if (miscdevice_feature_hiviewdfx_hisysevent) { external_deps += [ "hisysevent:libhisysevent" ] } -- Gitee