From 259612dc1c0a9a0f0df14e08cbf32a00a2804586 Mon Sep 17 00:00:00 2001
From: lfSeanDragon <18309220525@163.com>
Date: Mon, 8 Sep 2025 04:00:07 +0000
Subject: [PATCH 1/2] =?UTF-8?q?=E9=9C=87=E5=8A=A8=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lfSeanDragon <18309220525@163.com>
---
 services/miscdevice_service/src/vibration_priority_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/miscdevice_service/src/vibration_priority_manager.cpp b/services/miscdevice_service/src/vibration_priority_manager.cpp
index 865fb5f..c10fa8c 100644
--- a/services/miscdevice_service/src/vibration_priority_manager.cpp
+++ b/services/miscdevice_service/src/vibration_priority_manager.cpp
@@ -702,13 +702,13 @@ VibrateStatus VibrationPriorityManager::ShouldIgnoreVibrate(const VibrateInfo &v
         MISC_HILOGD("Vibration is ignored for feedback:%{public}d", static_cast<int32_t>(miscFeedback_));
         return IGNORE_FEEDBACK;
         }
-    }
 #ifdef OHOS_BUILD_ENABLE_VIBRATOR_CROWN
     if (ShouldIgnoreByIntensity(vibrateInfo)) {
         MISC_HILOGI("ShouldIgnoreByIntensity: vibrateInfo.effect:%{public}s", vibrateInfo.effect.c_str());
         return IGNORE_FEEDBACK;
     }
 #endif
+    }
     if (vibratorThread == nullptr) {
         MISC_HILOGD("There is no vibration, it can vibrate");
         return VIBRATION;
-- 
Gitee


From 1098c5c7141fe32c6f0f3dbcf45927c4ef1adb01 Mon Sep 17 00:00:00 2001
From: wuzhihuitmac <wuzhihui4@huawei.com>
Date: Thu, 11 Sep 2025 11:23:18 +0800
Subject: [PATCH 2/2] Add scope check

Signed-off-by: wuzhihuitmac <wuzhihui4@huawei.com>
Change-Id: I5c357d312bd342ef13c7b4b0b4fc84df9d973d83
---
 frameworks/js/napi/vibrator/src/vibrator_napi_error.cpp     | 6 +++++-
 .../miscdevice_service/src/vibration_priority_manager.cpp   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frameworks/js/napi/vibrator/src/vibrator_napi_error.cpp b/frameworks/js/napi/vibrator/src/vibrator_napi_error.cpp
index a23eca5..e70b9fd 100644
--- a/frameworks/js/napi/vibrator/src/vibrator_napi_error.cpp
+++ b/frameworks/js/napi/vibrator/src/vibrator_napi_error.cpp
@@ -52,7 +52,11 @@ void ThrowErr(const napi_env &env, const int32_t errCode, const std::string &pri
         return;
     }
     napi_handle_scope scope = nullptr;
-    napi_open_handle_scope(env, &scope);
+    napi_status status = napi_open_handle_scope(env, &scope);
+    if (status != napi_ok || scope == nullptr) {
+        MISC_HILOGE("napi_open_handle_scope fail");
+        return;
+    }
     napi_value error = CreateBusinessError(env, errCode, msg.value());
     napi_throw(env, error);
     napi_close_handle_scope(env, scope);
diff --git a/services/miscdevice_service/src/vibration_priority_manager.cpp b/services/miscdevice_service/src/vibration_priority_manager.cpp
index c10fa8c..865fb5f 100644
--- a/services/miscdevice_service/src/vibration_priority_manager.cpp
+++ b/services/miscdevice_service/src/vibration_priority_manager.cpp
@@ -702,13 +702,13 @@ VibrateStatus VibrationPriorityManager::ShouldIgnoreVibrate(const VibrateInfo &v
         MISC_HILOGD("Vibration is ignored for feedback:%{public}d", static_cast<int32_t>(miscFeedback_));
         return IGNORE_FEEDBACK;
         }
+    }
 #ifdef OHOS_BUILD_ENABLE_VIBRATOR_CROWN
     if (ShouldIgnoreByIntensity(vibrateInfo)) {
         MISC_HILOGI("ShouldIgnoreByIntensity: vibrateInfo.effect:%{public}s", vibrateInfo.effect.c_str());
         return IGNORE_FEEDBACK;
     }
 #endif
-    }
     if (vibratorThread == nullptr) {
         MISC_HILOGD("There is no vibration, it can vibrate");
         return VIBRATION;
-- 
Gitee