From 47f16f6e014b9bcc38453fefac2c41e4ce739cfa Mon Sep 17 00:00:00 2001
From: lixiangpeng5 <lixiangpeng5@huawei.com>
Date: Wed, 28 Aug 2024 08:19:58 +0000
Subject: [PATCH] fix sceneboard vibrate time

Signed-off-by: lixiangpeng5 <lixiangpeng5@huawei.com>
Change-Id: Icfe1949a014ee174c5f397e08b4d2a3270d0eef9
---
 services/miscdevice_service/src/miscdevice_service.cpp       | 3 ++-
 services/miscdevice_service/src/miscdevice_service_stub.cpp  | 1 -
 .../miscdevice_service/src/vibration_priority_manager.cpp    | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp
index e1afa64..f0bfd10 100644
--- a/services/miscdevice_service/src/miscdevice_service.cpp
+++ b/services/miscdevice_service/src/miscdevice_service.cpp
@@ -110,7 +110,8 @@ int32_t MiscdeviceService::SubscribeCommonEvent(const std::string &eventName, Ev
     return ERR_OK;
 }
 
-void MiscdeviceService::OnAddSystemAbility(int32_t systemAbilityId, const std::string &deviceId)
+void MiscdeviceService::OnAddSystemAbility(int32_t systemAbilityId,
+    const std::string &deviceId) __attribute__((no_sanitize("cfi")))
 {
     MISC_HILOGI("OnAddSystemAbility systemAbilityId:%{public}d", systemAbilityId);
     switch (systemAbilityId) {
diff --git a/services/miscdevice_service/src/miscdevice_service_stub.cpp b/services/miscdevice_service/src/miscdevice_service_stub.cpp
index 606630b..25adb40 100644
--- a/services/miscdevice_service/src/miscdevice_service_stub.cpp
+++ b/services/miscdevice_service/src/miscdevice_service_stub.cpp
@@ -186,7 +186,6 @@ int32_t MiscdeviceServiceStub::PlayVibratorCustomStub(MessageParcel &data, Messa
         return ERROR;
     }
     ret = PlayVibratorCustom(vibratorId, rawFd, usage, systemUsage, parameter.value());
-    close(rawFd.fd);
     if (ret != ERR_OK) {
         MISC_HILOGD("PlayVibratorCustom failed, ret:%{public}d", ret);
         return ret;
diff --git a/services/miscdevice_service/src/vibration_priority_manager.cpp b/services/miscdevice_service/src/vibration_priority_manager.cpp
index 29c4945..29e6fd8 100644
--- a/services/miscdevice_service/src/vibration_priority_manager.cpp
+++ b/services/miscdevice_service/src/vibration_priority_manager.cpp
@@ -39,6 +39,7 @@ const std::string SETTING_COLUMN_VALUE = "VALUE";
 const std::string SETTING_FEEDBACK_KEY = "physic_navi_haptic_feedback_enabled";
 const std::string SETTING_RINGER_MODE_KEY = "ringer_mode";
 const std::string SETTING_URI_PROXY = "datashare:///com.ohos.settingsdata/entry/settingsdata/SETTINGSDATA?Proxy=true";
+const std::string SCENEBOARD_BUNDLENAME = "com.ohos.sceneboard";
 constexpr const char *SETTINGS_DATA_EXT_URI = "datashare:///com.ohos.settingsdata.DataAbility";
 constexpr int32_t DECEM_BASE = 10;
 constexpr int32_t DATA_SHARE_READY = 0;
@@ -195,6 +196,10 @@ bool VibrationPriorityManager::IsSystemCalling()
 
 bool VibrationPriorityManager::ShouldIgnoreInputMethod(const VibrateInfo &vibrateInfo)
 {
+    if (vibrateInfo.packageName == SCENEBOARD_BUNDLENAME) {
+        MISC_HILOGD("Can not ignore for %{public}s", vibrateInfo.packageName.c_str());
+        return false;
+    }
     int32_t pid = vibrateInfo.pid;
     AppExecFwk::RunningProcessInfo processinfo{};
     appMgrClientPtr_ = DelayedSingleton<AppExecFwk::AppMgrClient>::GetInstance();
-- 
Gitee