diff --git a/services/miscdevice_service/include/miscdevice_service.h b/services/miscdevice_service/include/miscdevice_service.h index 2c159524be4e7190d15986eb7ae0ce9a5896f767..c73c4ad23ebcf43e8b44173dfbb5706ba3b856af 100644 --- a/services/miscdevice_service/include/miscdevice_service.h +++ b/services/miscdevice_service/include/miscdevice_service.h @@ -75,6 +75,9 @@ private: bool InitInterface(); bool InitLightInterface(); std::string GetPackageName(AccessTokenID tokenId); +#ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO + int32_t FastVibratorEffect(const VibrateInfo &info); +#endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO void StartVibrateThread(VibrateInfo info); int32_t StopVibratorService(int32_t vibratorId); void StopVibrateThread(); diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 41447dbd09e42a788e7ad0e4efd0894c726f5348..c4f130b80f608e8c74c1da95746af6720368a53e 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -468,6 +468,11 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str MISC_HILOGE("%{public}s:vibration is ignored and high priority is vibrating", curVibrateTime.c_str()); return ERROR; } +#ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO + if (count == 1) { + return FastVibratorEffect(info); + } +#endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO 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, count:%{public}d", curVibrateTime.c_str(), @@ -1080,6 +1085,11 @@ int32_t MiscdeviceService::PlayPrimitiveEffect(int32_t vibratorId, const std::st MISC_HILOGE("%{public}s:vibration is ignored and high priority is vibrating", curVibrateTime.c_str()); return ERROR; } +#ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO + if (count == 1) { + return FastVibratorEffect(info); + } +#endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO 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, intensity:%{public}d", curVibrateTime.c_str(), @@ -1087,6 +1097,17 @@ int32_t MiscdeviceService::PlayPrimitiveEffect(int32_t vibratorId, const std::st return NO_ERROR; } +#ifdef OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO +int32_t MiscdeviceService::FastVibratorEffect(const VibrateInfo &info) +{ + int32_t ret = VibratorDevice.StartByIntensity(info.effect, info.intensity); + if (ret != SUCCESS) { + MISC_HILOGE("Vibrate effect %{public}s failed, ", info.effect.c_str()); + } + return NO_ERROR; +} +#endif // OHOS_BUILD_ENABLE_VIBRATOR_PRESET_INFO + int32_t MiscdeviceService::PlayPrimitiveEffectCheckAuthAndParam(int32_t intensity, int32_t usage) { PermissionUtil &permissionUtil = PermissionUtil::GetInstance();