diff --git a/frameworks/js/napi/vibrator/src/vibrator_js.cpp b/frameworks/js/napi/vibrator/src/vibrator_js.cpp
index e1f76a3deb9fb5088be5c5b665835d73dbafcc25..829716b13ab11c0104d1854577894dc9d2bab42e 100644
--- a/frameworks/js/napi/vibrator/src/vibrator_js.cpp
+++ b/frameworks/js/napi/vibrator/src/vibrator_js.cpp
@@ -262,7 +262,6 @@ static napi_value VibrateEffect(napi_env env, napi_value args[], size_t argc)
 
 static napi_value StartVibrate(napi_env env, napi_callback_info info)
 {
-    CALL_LOG_ENTER;
     CHKPP(env);
     CHKPP(info);
     size_t argc = 3;
diff --git a/frameworks/native/vibrator/src/vibrator_service_client.cpp b/frameworks/native/vibrator/src/vibrator_service_client.cpp
index b9e34a26ef29c5be4740413149a623619f07ff86..5694af53ea690a3eabf379e79e414d04c5a4066b 100644
--- a/frameworks/native/vibrator/src/vibrator_service_client.cpp
+++ b/frameworks/native/vibrator/src/vibrator_service_client.cpp
@@ -231,7 +231,7 @@ bool VibratorServiceClient::IsHdHapticSupported()
     CALL_LOG_ENTER;
     int32_t ret = InitServiceClient();
     if (ret != ERR_OK) {
-        MISC_HILOGD("InitServiceClient failed, ret:%{public}d", ret);
+        MISC_HILOGE("InitServiceClient failed, ret:%{public}d", ret);
         return MISC_NATIVE_GET_SERVICE_ERR;
     }
     return capacity_.isSupportHdHaptic;
diff --git a/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp b/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp
index 5c3d631955658786103b064aaa1745b4b56a8b83..6b044bd93df4255186516dde0fd70dbfdbcda771 100644
--- a/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp
+++ b/services/miscdevice_service/haptic_matcher/src/custom_vibration_matcher.cpp
@@ -57,9 +57,9 @@ CustomVibrationMatcher::CustomVibrationMatcher()
         return;
     }
     if (!hdfWaveInfos_.empty()) {
-        for (auto it = hdfWaveInfos_.begin(); it != hdfWaveInfos_.end(); ++it) {
+        for (const auto &info : hdfWaveInfos_) {
             MISC_HILOGI("waveId:%{public}d, intensity:%{public}f, frequency:%{public}f, duration:%{public}d",
-                it->waveId, it->intensity, it->frequency, it->duration);
+                info.waveId, info.intensity, info.frequency, info.duration);
         }
         NormalizedWaveInfo();
     }
@@ -72,10 +72,10 @@ void CustomVibrationMatcher::NormalizedWaveInfo()
     float maxIntensity = firstIt->intensity;
     float minFrequency = firstIt->frequency;
     float maxFrequency = firstIt->frequency;
-    for (auto it = hdfWaveInfos_.begin(); it != hdfWaveInfos_.end(); ++it) {
-        maxIntensity = (maxIntensity > it->intensity) ? maxIntensity : it->intensity;
-        minFrequency = (minFrequency < it->frequency) ? minFrequency : it->frequency;
-        maxFrequency = (maxFrequency > it->frequency) ? maxFrequency : it->frequency;
+    for (const auto &info : hdfWaveInfos_) {
+        maxIntensity = (maxIntensity > info.intensity) ? maxIntensity : info.intensity;
+        minFrequency = (minFrequency < info.frequency) ? minFrequency : info.frequency;
+        maxFrequency = (maxFrequency > info.frequency) ? maxFrequency : info.frequency;
     }
 
     float intensityEqualValue = maxIntensity / INTENSITY_MAX;
@@ -84,16 +84,16 @@ void CustomVibrationMatcher::NormalizedWaveInfo()
         MISC_HILOGE("The equal value of intensity or frequency is zero");
         return;
     }
-    for (auto it = hdfWaveInfos_.begin(); it != hdfWaveInfos_.end(); ++it) {
+    for (const auto &info : hdfWaveInfos_) {
         std::vector<int32_t> normalizedValue;
-        normalizedValue.push_back(static_cast<int32_t>(it->intensity / intensityEqualValue));
-        normalizedValue.push_back(static_cast<int32_t>((it->frequency - minFrequency) / frequencyEqualValue));
-        normalizedValue.push_back(it->duration);
-        waveInfos_[it->waveId] = normalizedValue;
+        normalizedValue.push_back(static_cast<int32_t>(info.intensity / intensityEqualValue));
+        normalizedValue.push_back(static_cast<int32_t>((info.frequency - minFrequency) / frequencyEqualValue));
+        normalizedValue.push_back(info.duration);
+        waveInfos_[info.waveId] = normalizedValue;
     }
-    for (auto it = waveInfos_.begin(); it != waveInfos_.end(); ++it) {
+    for (const auto &info : waveInfos_) {
         MISC_HILOGI("waveId:%{public}d, intensity:%{public}d, frequency:%{public}d, duration:%{public}d",
-            it->first, it->second[0], it->second[1], it->second[WAVE_INFO_DIMENSION - 1]);
+            info.first, info.second[0], info.second[1], info.second[WAVE_INFO_DIMENSION - 1]);
     }
 }