diff --git a/frameworks/native/miscdevice/src/vibrator_service_client.cpp b/frameworks/native/miscdevice/src/vibrator_service_client.cpp index adefcdd5856f6c517c853cfc3f7a838c4fdaf6f1..cc364045b130afb35d0d134898ac05c594f489cd 100755 --- a/frameworks/native/miscdevice/src/vibrator_service_client.cpp +++ b/frameworks/native/miscdevice/src/vibrator_service_client.cpp @@ -132,7 +132,7 @@ int32_t VibratorServiceClient::Stop(int32_t vibratorId, const std::string &type) HiLog::Error(LABEL, "%{public}s InitServiceClient failed, ret : %{public}d", __func__, ret); return MISC_NATIVE_GET_SERVICE_ERR; } - if ((type == "customized") || (type == "time")) { + if (type == "time") { ret = miscdeviceProxy_->CancelVibrator(vibratorId); } else { ret = miscdeviceProxy_->StopVibratorEffect(vibratorId, type); diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp index 96fa0183bdf59bb4860a40a66df45238bd828ff4..c4bbbb00a48aed4a09eaa7647b25d7f8a8d97316 100644 --- a/interfaces/native/vibrator/src/vibrator_agent.cpp +++ b/interfaces/native/vibrator/src/vibrator_agent.cpp @@ -54,7 +54,7 @@ int32_t StartVibrator(const char *effectId) int32_t StartVibratorOnce(uint32_t duration) { - if (duration <= 0) { + if (duration == 0) { HiLog::Error(LABEL, "%{public}s duration is invalid", __func__); return OHOS::Sensors::ERROR; } diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index 6989230543726d92aece98b577fbdea238a0ed92..a6e64282a47d296b8d80bd96432067698ca70eb5 100644 --- a/services/miscdevice_service/src/miscdevice_service.cpp +++ b/services/miscdevice_service/src/miscdevice_service.cpp @@ -233,10 +233,6 @@ int32_t MiscdeviceService::PlayVibratorEffect(int32_t vibratorId, const std::str const char *effectType = (char *)effect.data(); return vibratorHdiConnection_.Start(effectType); } - if (hapticRingMap_.empty()) { - HiLog::Error(LABEL, "%{public}s hapticRingMap_ cannot be empty", __func__); - return ERROR; - } std::unordered_map::iterator iter = hapticRingMap_.find(effect); if (iter == hapticRingMap_.end()) { HiLog::Error(LABEL, "%{public}s is not exist", __func__);