From 275230929b3f16ac0983ac419951f8562fbbe47f Mon Sep 17 00:00:00 2001 From: liyaoyao Date: Tue, 25 Mar 2025 02:38:18 +0000 Subject: [PATCH 1/2] update services/miscdevice_service/src/miscdevice_service.cpp. Signed-off-by: liyaoyao --- services/miscdevice_service/src/miscdevice_service.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index eb5b44d..b6e7481 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -799,6 +799,9 @@ int32_t MiscdeviceService::PlayPattern(const VibratePattern &pattern, int32_t us return ERROR; } StartVibrateThread(info); + MISC_HILOGI("Start vibrator, currentTime:%{public}s, package:%{public}s, pid:%{public}d, usage:%{public}d," + "duration:%{public}d", curVibrateTime.c_str(), info.packageName.c_str(), info.pid, info.usage, + pattern.patternDuration); return vibratorHdiConnection_.PlayPattern(package.patterns.front()); } else if (g_capacity.isSupportPresetMapping) { info.mode = VIBRATE_CUSTOM_COMPOSITE_EFFECT; @@ -1030,8 +1033,8 @@ int32_t MiscdeviceService::PlayPrimitiveEffect(int32_t vibratorId, const std::st } StartVibrateThread(info); MISC_HILOGI("Start vibrator, currentTime:%{public}s, package:%{public}s, pid:%{public}d, usage:%{public}d," - "vibratorId:%{public}d, duration:%{public}d, effect:%{public}s", curVibrateTime.c_str(), - info.packageName.c_str(), info.pid, info.usage, vibratorId, info.duration, info.effect.c_str()); + "vibratorId:%{public}d, duration:%{public}d, effect:%{public}s, intensity:%{public}d", curVibrateTime.c_str(), + info.packageName.c_str(), info.pid, info.usage, vibratorId, info.duration, info.effect.c_str(), info.intensity); return NO_ERROR; } -- Gitee From 8932aed4bc270dd47f9be9b0510abea5287c34e7 Mon Sep 17 00:00:00 2001 From: liyaoyao Date: Sat, 29 Mar 2025 07:12:55 +0000 Subject: [PATCH 2/2] update services/miscdevice_service/src/miscdevice_service.cpp. Signed-off-by: liyaoyao --- services/miscdevice_service/src/miscdevice_service.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index b6e7481..325daa9 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -506,6 +506,12 @@ int32_t MiscdeviceService::StopVibratorByMode(int32_t vibratorId, const std::str return PERMISSION_DENIED; } if ((vibratorThread_ == nullptr) || (!vibratorThread_->IsRunning())) { +#if defined(OHOS_BUILD_ENABLE_VIBRATOR_CUSTOM) && defined(HDF_DRIVERS_INTERFACE_VIBRATOR) + if (vibratorHdiConnection_.IsVibratorRunning()) { + vibratorHdiConnection_.Stop(HDF_VIBRATE_MODE_PRESET); + vibratorHdiConnection_.Stop(HDF_VIBRATE_MODE_HDHAPTIC); + } +#endif // OHOS_BUILD_ENABLE_VIBRATE_CUSTOM && HDF_DRIVERS_INTERFACE_VIBRATOR MISC_HILOGD("No vibration, no need to stop"); return ERROR; } -- Gitee