diff --git a/services/miscdevice_service/src/miscdevice_service.cpp b/services/miscdevice_service/src/miscdevice_service.cpp index e1afa64118507997c4ba7e1f23adcde71f20d19e..f0bfd10d0fc4517713937f852e9b09e286e9aa36 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 606630b0cde54a7c0651e5026b9e5ff51aa22bcb..25adb40e8e8f380787e0e25f3067ada6a317aba1 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 29c494518ff1f17a033e424b87f7677528684df3..29e6fd80eb0df08a8339fe3bc45241eff7ecb44f 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::GetInstance();