From 4bf7076e9459d02d67fd5aeadbf03fe8a31de8c0 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Mon, 21 Mar 2022 10:17:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E8=BE=BE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-yaoyao777 --- frameworks/native/miscdevice/src/vibrator_service_client.cpp | 2 +- interfaces/native/vibrator/src/vibrator_agent.cpp | 2 +- services/miscdevice_service/src/miscdevice_service.cpp | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/frameworks/native/miscdevice/src/vibrator_service_client.cpp b/frameworks/native/miscdevice/src/vibrator_service_client.cpp index adefcdd..cc36404 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 96fa018..b9faba5 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 6989230..a6e6428 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__); -- Gitee From 310da9db359fbad8e49d637cd2fb0e0d608db1c5 Mon Sep 17 00:00:00 2001 From: li-yaoyao777 Date: Mon, 21 Mar 2022 14:53:26 +0800 Subject: [PATCH 2/2] vibrator_agent.cpp Signed-off-by: li-yaoyao777 --- interfaces/native/vibrator/src/vibrator_agent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/native/vibrator/src/vibrator_agent.cpp b/interfaces/native/vibrator/src/vibrator_agent.cpp index b9faba5..c4bbbb0 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; } -- Gitee